web-ext 7.2.0 → 7.3.0

package/lib/util/adb.js.map

@@ -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","constructor","params","adb","adbBin","adbHost","adbPort","adbClient","createClient","bin","host","port","artifactsDirMap","Map","userAbortDiscovery","runShellCommand","deviceId","cmd","debug","JSON","stringify","getDevice","shell","then","util","readAll","res","toString","discoverDevices","devices","listDevices","map","dev","id","discoverInstalledFirefoxAPKs","firefoxApk","pmList","split","line","replace","trim","filter","browser","startsWith","getAndroidVersionNumber","androidVersion","androidVersionNumber","parseInt","isNaN","ensureRequiredAPKRuntimePermissions","apk","permissions","permissionsMap","perm","pmDumpLogs","amForceStopAPK","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","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":["/* @flow */\nimport ADBKit from '@devicefarmer/adbkit';\n\nimport {\n  isErrorWithCode,\n  UsageError,\n  WebExtError,\n} 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\nexport type ADBUtilsParams = {|\n  adb?: typeof defaultADB,\n  // ADB configs.\n  adbBin?: string,\n  adbHost?: string,\n  adbPort?: string,\n  adbDevice?: string,\n|};\n\nexport type DiscoveryParams = {\n  maxDiscoveryTime: number,\n  retryInterval: number,\n};\n\n// Helper function used to raise an UsageError when the adb binary has not been found.\nasync function wrapADBCall(asyncFn: (...any) => Promise<any>): Promise<any> {\n  try {\n    return await asyncFn();\n  } catch (error) {\n    if (isErrorWithCode('ENOENT', error) &&\n        error.message.includes('spawn adb')) {\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    throw error;\n  }\n}\n\nexport default class ADBUtils {\n  params: ADBUtilsParams;\n  adb: typeof defaultADB;\n  adbClient: any; // TODO: better flow typing here.\n\n  // Map<deviceId -> artifactsDir>\n  artifactsDirMap: Map<string, string>;\n  // Toggled when the user wants to abort the RDP Unix Socket discovery loop\n  // while it is still executing.\n  userAbortDiscovery: boolean;\n\n  constructor(params: ADBUtilsParams) {\n    this.params = params;\n\n    const {\n      adb,\n      adbBin,\n      adbHost,\n      adbPort,\n    } = 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(\n    deviceId: string, cmd: string | Array<string>\n  ): Promise<string> {\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.getDevice(deviceId).shell(cmd).then(\n        adb.util.readAll\n      );\n    }).then((res) => res.toString());\n  }\n\n  async discoverDevices(): Promise<Array<string>> {\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 discoverInstalledFirefoxAPKs(\n    deviceId: string,\n    firefoxApk?: string\n  ): Promise<Array<string>> {\n    log.debug(`Listing installed Firefox APKs on ${deviceId}`);\n\n    const pmList = await this.runShellCommand(deviceId, [\n      'pm', 'list', 'packages',\n    ]);\n\n    return pmList.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 getAndroidVersionNumber(deviceId: string): Promise<number> {\n    const androidVersion = (await this.runShellCommand(deviceId, [\n      'getprop', 'ro.build.version.sdk',\n    ])).trim();\n\n    const androidVersionNumber = parseInt(androidVersion);\n\n    // No need to check the granted runtime permissions on Android versions < Lollypop.\n    if (isNaN(androidVersionNumber)) {\n      throw new WebExtError(\n        'Unable to discovery android version on ' +\n        `${deviceId}: ${androidVersion}`\n      );\n    }\n\n    return androidVersionNumber;\n  }\n\n  // Raise an UsageError when the given APK does not have the required runtime permissions.\n  async ensureRequiredAPKRuntimePermissions(\n    deviceId: string, apk: string, permissions: Array<string>\n  ): Promise<void> {\n    const permissionsMap = {};\n\n    // Initialize every permission to false in the permissions map.\n    for (const perm of permissions) {\n      permissionsMap[perm] = false;\n    }\n\n    // Retrieve the permissions information for the given apk.\n    const pmDumpLogs = (await this.runShellCommand(deviceId, [\n      'pm', 'dump', apk,\n    ])).split('\\n');\n\n    // Set to true the required permissions that have been granted.\n    for (const line of pmDumpLogs) {\n      for (const perm of permissions) {\n        if (line.includes(`${perm}: granted=true`) ||\n            line.includes(`${perm}, granted=true`)) {\n          permissionsMap[perm] = true;\n        }\n      }\n    }\n\n    for (const perm of permissions) {\n      if (!permissionsMap[perm]) {\n        throw new UsageError(\n          `Required ${perm} has not be granted for ${apk}. ` +\n          'Please grant them using the Android Settings ' +\n          'or using the following adb command:\\n' +\n          `\\t adb shell pm grant ${apk} ${perm}\\n`\n        );\n      }\n    }\n  }\n\n  async amForceStopAPK(deviceId: string, apk: string): Promise<void> {\n    await this.runShellCommand(deviceId, [\n      'am', 'force-stop', apk,\n    ]);\n  }\n\n  async getOrCreateArtifactsDir(deviceId: string): Promise<string> {\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 = (await this.runShellCommand(\n      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(\n    deviceId: string, removeArtifactDirs?: boolean = false\n  ): Promise<boolean> {\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.getDevice(deviceId).readdir(\n        DEVICE_DIR_BASE\n      );\n      let found = false;\n\n      for (const file of files) {\n        if (!file.isDirectory() ||\n            !file.name.startsWith(ARTIFACTS_DIR_PREFIX)) {\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: string): Promise<void> {\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(\n    deviceId: string, localPath: string, devicePath: string\n  ): Promise<void> {\n    const {adbClient} = this;\n\n    log.debug(`Pushing ${localPath} to ${devicePath} on ${deviceId}`);\n\n    await wrapADBCall(async () => {\n      await adbClient.getDevice(deviceId).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(\n    deviceId: string,\n    apk: string,\n    apkComponent: ?string,\n    deviceProfileDir: string,\n  ): Promise<void> {\n    const {adbClient} = this;\n\n    log.debug(\n      `Starting ${apk} on ${deviceId}`\n    );\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      key: 'args',\n      value: `-profile ${deviceProfileDir}`,\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\n    // browser package prefix: prepend the package identifier\n    // before `apkComponent`\n    if (apkComponent.startsWith('.')) {\n      for (const browser of packageIdentifiers) {\n        if (apk === browser || apk.startsWith(`${browser}.`)) {\n          apkComponent = browser + apkComponent;\n        }\n      }\n    }\n\n    // if `apkComponent` starts with a '.', then adb will expand\n    // the following to: `${apk}/${apk}.${apkComponent}`\n    const component = `${apk}/${apkComponent}`;\n\n    await wrapADBCall(async () => {\n      await adbClient.getDevice(deviceId).startActivity({\n        wait: true,\n        action: 'android.activity.MAIN',\n        component,\n        extras,\n      });\n    });\n  }\n\n  setUserAbortDiscovery(value: boolean) {\n    this.userAbortDiscovery = value;\n  }\n\n  async discoverRDPUnixSocket(\n    deviceId: string, apk: string,\n    {maxDiscoveryTime, retryInterval}: DiscoveryParams = {}\n  ): Promise<string> {\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\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 = (await this.runShellCommand(deviceId, [\n        'cat', '/proc/net/unix',\n      ])).split('\\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: string, remote: string, local: string) {\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?: string): Promise<Array<string>> {\n  const adbUtils = new ADBUtils({adbBin});\n  return adbUtils.discoverDevices();\n}\n\nexport async function listADBFirefoxAPKs(\n  deviceId: string,\n  adbBin?: string\n): Promise<Array<string>> {\n  const adbUtils = new ADBUtils({adbBin});\n  return adbUtils.discoverInstalledFirefoxAPKs(deviceId);\n}\n"],"mappings":"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"}
+{"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","constructor","params","adb","adbBin","adbHost","adbPort","adbClient","createClient","bin","host","port","artifactsDirMap","Map","userAbortDiscovery","runShellCommand","deviceId","cmd","debug","JSON","stringify","getDevice","shell","then","util","readAll","res","toString","discoverDevices","devices","listDevices","map","dev","id","discoverInstalledFirefoxAPKs","firefoxApk","pmList","split","line","replace","trim","filter","browser","startsWith","getAndroidVersionNumber","androidVersion","androidVersionNumber","parseInt","isNaN","ensureRequiredAPKRuntimePermissions","apk","permissions","permissionsMap","perm","pmDumpLogs","amForceStopAPK","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","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":["/* @flow */\nimport ADBKit from '@devicefarmer/adbkit';\n\nimport {\n  isErrorWithCode,\n  UsageError,\n  WebExtError,\n} 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\nexport type ADBUtilsParams = {|\n  adb?: typeof defaultADB,\n  // ADB configs.\n  adbBin?: string,\n  adbHost?: string,\n  adbPort?: string,\n  adbDevice?: string,\n|};\n\nexport type DiscoveryParams = {\n  maxDiscoveryTime: number,\n  retryInterval: number,\n};\n\n// Helper function used to raise an UsageError when the adb binary has not been found.\nasync function wrapADBCall(asyncFn: (...any) => Promise<any>): Promise<any> {\n  try {\n    return await asyncFn();\n  } catch (error) {\n    if (isErrorWithCode('ENOENT', error) &&\n        error.message.includes('spawn adb')) {\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    throw error;\n  }\n}\n\nexport default class ADBUtils {\n  params: ADBUtilsParams;\n  adb: typeof defaultADB;\n  adbClient: any; // TODO: better flow typing here.\n\n  // Map<deviceId -> artifactsDir>\n  artifactsDirMap: Map<string, string>;\n  // Toggled when the user wants to abort the RDP Unix Socket discovery loop\n  // while it is still executing.\n  userAbortDiscovery: boolean;\n\n  constructor(params: ADBUtilsParams) {\n    this.params = params;\n\n    const {\n      adb,\n      adbBin,\n      adbHost,\n      adbPort,\n    } = 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(\n    deviceId: string, cmd: string | Array<string>\n  ): Promise<string> {\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.getDevice(deviceId).shell(cmd).then(\n        adb.util.readAll\n      );\n    }).then((res) => res.toString());\n  }\n\n  async discoverDevices(): Promise<Array<string>> {\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 discoverInstalledFirefoxAPKs(\n    deviceId: string,\n    firefoxApk?: string\n  ): Promise<Array<string>> {\n    log.debug(`Listing installed Firefox APKs on ${deviceId}`);\n\n    const pmList = await this.runShellCommand(deviceId, [\n      'pm', 'list', 'packages',\n    ]);\n\n    return pmList.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 getAndroidVersionNumber(deviceId: string): Promise<number> {\n    const androidVersion = (await this.runShellCommand(deviceId, [\n      'getprop', 'ro.build.version.sdk',\n    ])).trim();\n\n    const androidVersionNumber = parseInt(androidVersion);\n\n    // No need to check the granted runtime permissions on Android versions < Lollypop.\n    if (isNaN(androidVersionNumber)) {\n      throw new WebExtError(\n        'Unable to discovery android version on ' +\n        `${deviceId}: ${androidVersion}`\n      );\n    }\n\n    return androidVersionNumber;\n  }\n\n  // Raise an UsageError when the given APK does not have the required runtime permissions.\n  async ensureRequiredAPKRuntimePermissions(\n    deviceId: string, apk: string, permissions: Array<string>\n  ): Promise<void> {\n    const permissionsMap = {};\n\n    // Initialize every permission to false in the permissions map.\n    for (const perm of permissions) {\n      permissionsMap[perm] = false;\n    }\n\n    // Retrieve the permissions information for the given apk.\n    const pmDumpLogs = (await this.runShellCommand(deviceId, [\n      'pm', 'dump', apk,\n    ])).split('\\n');\n\n    // Set to true the required permissions that have been granted.\n    for (const line of pmDumpLogs) {\n      for (const perm of permissions) {\n        if (line.includes(`${perm}: granted=true`) ||\n            line.includes(`${perm}, granted=true`)) {\n          permissionsMap[perm] = true;\n        }\n      }\n    }\n\n    for (const perm of permissions) {\n      if (!permissionsMap[perm]) {\n        throw new UsageError(\n          `Required ${perm} has not be granted for ${apk}. ` +\n          'Please grant them using the Android Settings ' +\n          'or using the following adb command:\\n' +\n          `\\t adb shell pm grant ${apk} ${perm}\\n`\n        );\n      }\n    }\n  }\n\n  async amForceStopAPK(deviceId: string, apk: string): Promise<void> {\n    await this.runShellCommand(deviceId, [\n      'am', 'force-stop', apk,\n    ]);\n  }\n\n  async getOrCreateArtifactsDir(deviceId: string): Promise<string> {\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 = (await this.runShellCommand(\n      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(\n    deviceId: string, removeArtifactDirs?: boolean = false\n  ): Promise<boolean> {\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.getDevice(deviceId).readdir(\n        DEVICE_DIR_BASE\n      );\n      let found = false;\n\n      for (const file of files) {\n        if (!file.isDirectory() ||\n            !file.name.startsWith(ARTIFACTS_DIR_PREFIX)) {\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: string): Promise<void> {\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(\n    deviceId: string, localPath: string, devicePath: string\n  ): Promise<void> {\n    const {adbClient} = this;\n\n    log.debug(`Pushing ${localPath} to ${devicePath} on ${deviceId}`);\n\n    await wrapADBCall(async () => {\n      await adbClient.getDevice(deviceId).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(\n    deviceId: string,\n    apk: string,\n    apkComponent: ?string,\n    deviceProfileDir: string,\n  ): Promise<void> {\n    const {adbClient} = this;\n\n    log.debug(\n      `Starting ${apk} on ${deviceId}`\n    );\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      key: 'args',\n      value: `-profile ${deviceProfileDir}`,\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\n    // browser package prefix: prepend the package identifier\n    // before `apkComponent`\n    if (apkComponent.startsWith('.')) {\n      for (const browser of packageIdentifiers) {\n        if (apk === browser || apk.startsWith(`${browser}.`)) {\n          apkComponent = browser + apkComponent;\n        }\n      }\n    }\n\n    // if `apkComponent` starts with a '.', then adb will expand\n    // the following to: `${apk}/${apk}.${apkComponent}`\n    const component = `${apk}/${apkComponent}`;\n\n    await wrapADBCall(async () => {\n      await adbClient.getDevice(deviceId).startActivity({\n        wait: true,\n        action: 'android.activity.MAIN',\n        component,\n        extras,\n      });\n    });\n  }\n\n  setUserAbortDiscovery(value: boolean) {\n    this.userAbortDiscovery = value;\n  }\n\n  async discoverRDPUnixSocket(\n    deviceId: string, apk: string,\n    {maxDiscoveryTime, retryInterval}: DiscoveryParams = {}\n  ): Promise<string> {\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\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 = (await this.runShellCommand(deviceId, [\n        'cat', '/proc/net/unix',\n      ])).split('\\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: string, remote: string, local: string) {\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?: string): Promise<Array<string>> {\n  const adbUtils = new ADBUtils({adbBin});\n  return adbUtils.discoverDevices();\n}\n\nexport async function listADBFirefoxAPKs(\n  deviceId: string,\n  adbBin?: string\n): Promise<Array<string>> {\n  const adbUtils = new ADBUtils({adbBin});\n  return adbUtils.discoverInstalledFirefoxAPKs(deviceId);\n}\n"],"mappings":"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"}

package/lib/util/artifacts.js

@@ -1,3 +1,4 @@
+
 import { fs } from 'mz';
 import defaultAsyncMkdirp from 'mkdirp';
 import { UsageError, isErrorWithCode } from '../errors.js';
@@ -10,12 +11,10 @@ export async function prepareArtifactsDir(artifactsDir, {
 } = {}) {
   try {
     const stats = await fs.stat(artifactsDir);
-
     if (!stats.isDirectory()) {
       throw new UsageError(`--artifacts-dir="${artifactsDir}" exists but it is not a directory.`);
-    } // If the artifactsDir already exists, check that we have the write permissions on it.
-
-
+    }
+    // If the artifactsDir already exists, check that we have the write permissions on it.
     try {
       await asyncFsAccess(artifactsDir, fs.W_OK);
     } catch (accessErr) {
@@ -46,7 +45,6 @@ export async function prepareArtifactsDir(artifactsDir, {
       throw error;
     }
   }
-
   return artifactsDir;
 }
 //# sourceMappingURL=artifacts.js.map

package/lib/util/artifacts.js.map

@@ -1 +1 @@
-{"version":3,"file":"artifacts.js","names":["fs","defaultAsyncMkdirp","UsageError","isErrorWithCode","createLogger","log","import","meta","url","defaultAsyncFsAccess","access","bind","prepareArtifactsDir","artifactsDir","asyncMkdirp","asyncFsAccess","stats","stat","isDirectory","W_OK","accessErr","error","debug","mkdirErr"],"sources":["../../src/util/artifacts.js"],"sourcesContent":["/* @flow */\nimport {fs} from 'mz';\nimport defaultAsyncMkdirp from 'mkdirp';\n\nimport {UsageError, isErrorWithCode} from '../errors.js';\nimport {createLogger} from './logger.js';\n\nconst log = createLogger(import.meta.url);\n\nconst defaultAsyncFsAccess: typeof fs.access = fs.access.bind(fs);\n\ntype PrepareArtifactsDirOptions = {\n  asyncMkdirp?: typeof defaultAsyncMkdirp,\n  asyncFsAccess?: typeof defaultAsyncFsAccess,\n}\n\nexport async function prepareArtifactsDir(\n  artifactsDir: string,\n  {\n    asyncMkdirp = defaultAsyncMkdirp,\n    asyncFsAccess = defaultAsyncFsAccess,\n  }: PrepareArtifactsDirOptions = {},\n): Promise<string> {\n  try {\n    const stats = await fs.stat(artifactsDir);\n    if (!stats.isDirectory()) {\n      throw new UsageError(\n        `--artifacts-dir=\"${artifactsDir}\" exists but it is not a directory.`);\n    }\n    // If the artifactsDir already exists, check that we have the write permissions on it.\n    try {\n      await asyncFsAccess(artifactsDir, fs.W_OK);\n    } catch (accessErr) {\n      if (isErrorWithCode('EACCES', accessErr)) {\n        throw new UsageError(\n          `--artifacts-dir=\"${artifactsDir}\" exists but the user lacks ` +\n          'permissions on it.');\n      } 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    } 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        } else {\n          throw mkdirErr;\n        }\n      }\n    } else {\n      throw error;\n    }\n  }\n\n  return artifactsDir;\n}\n"],"mappings":"AACA,SAAQA,EAAR,QAAiB,IAAjB;AACA,OAAOC,kBAAP,MAA+B,QAA/B;AAEA,SAAQC,UAAR,EAAoBC,eAApB,QAA0C,cAA1C;AACA,SAAQC,YAAR,QAA2B,aAA3B;AAEA,MAAMC,GAAG,GAAGD,YAAY,CAACE,MAAM,CAACC,IAAP,CAAYC,GAAb,CAAxB;AAEA,MAAMC,oBAAsC,GAAGT,EAAE,CAACU,MAAH,CAAUC,IAAV,CAAeX,EAAf,CAA/C;AAOA,OAAO,eAAeY,mBAAf,CACLC,YADK,EAEL;EACEC,WAAW,GAAGb,kBADhB;EAEEc,aAAa,GAAGN;AAFlB,IAGgC,EAL3B,EAMY;EACjB,IAAI;IACF,MAAMO,KAAK,GAAG,MAAMhB,EAAE,CAACiB,IAAH,CAAQJ,YAAR,CAApB;;IACA,IAAI,CAACG,KAAK,CAACE,WAAN,EAAL,EAA0B;MACxB,MAAM,IAAIhB,UAAJ,CACH,oBAAmBW,YAAa,qCAD7B,CAAN;IAED,CALC,CAMF;;;IACA,IAAI;MACF,MAAME,aAAa,CAACF,YAAD,EAAeb,EAAE,CAACmB,IAAlB,CAAnB;IACD,CAFD,CAEE,OAAOC,SAAP,EAAkB;MAClB,IAAIjB,eAAe,CAAC,QAAD,EAAWiB,SAAX,CAAnB,EAA0C;QACxC,MAAM,IAAIlB,UAAJ,CACH,oBAAmBW,YAAa,8BAAjC,GACA,oBAFI,CAAN;MAGD,CAJD,MAIO;QACL,MAAMO,SAAN;MACD;IACF;EACF,CAlBD,CAkBE,OAAOC,KAAP,EAAc;IACd,IAAIlB,eAAe,CAAC,QAAD,EAAWkB,KAAX,CAAnB,EAAsC;MACpC;MACA,MAAM,IAAInB,UAAJ,CACH,kCAAiCW,YAAa,qBAA/C,GACC,sBAAqBQ,KAAM,EAFxB,CAAN;IAGD,CALD,MAKO,IAAIlB,eAAe,CAAC,QAAD,EAAWkB,KAAX,CAAnB,EAAsC;MAC3C;MACA,IAAI;QACFhB,GAAG,CAACiB,KAAJ,CAAW,iCAAgCT,YAAa,EAAxD;QACA,MAAMC,WAAW,CAACD,YAAD,CAAjB;MACD,CAHD,CAGE,OAAOU,QAAP,EAAiB;QACjB,IAAIpB,eAAe,CAAC,QAAD,EAAWoB,QAAX,CAAnB,EAAyC;UACvC;UACA,MAAM,IAAIrB,UAAJ,CACH,kCAAiCW,YAAa,gBAA/C,GACC,2BAA0BU,QAAS,EAFhC,CAAN;QAGD,CALD,MAKO;UACL,MAAMA,QAAN;QACD;MACF;IACF,CAfM,MAeA;MACL,MAAMF,KAAN;IACD;EACF;;EAED,OAAOR,YAAP;AACD"}
+{"version":3,"file":"artifacts.js","names":["fs","defaultAsyncMkdirp","UsageError","isErrorWithCode","createLogger","log","import","meta","url","defaultAsyncFsAccess","access","bind","prepareArtifactsDir","artifactsDir","asyncMkdirp","asyncFsAccess","stats","stat","isDirectory","W_OK","accessErr","error","debug","mkdirErr"],"sources":["../../src/util/artifacts.js"],"sourcesContent":["/* @flow */\nimport {fs} from 'mz';\nimport defaultAsyncMkdirp from 'mkdirp';\n\nimport {UsageError, isErrorWithCode} from '../errors.js';\nimport {createLogger} from './logger.js';\n\nconst log = createLogger(import.meta.url);\n\nconst defaultAsyncFsAccess: typeof fs.access = fs.access.bind(fs);\n\ntype PrepareArtifactsDirOptions = {\n  asyncMkdirp?: typeof defaultAsyncMkdirp,\n  asyncFsAccess?: typeof defaultAsyncFsAccess,\n}\n\nexport async function prepareArtifactsDir(\n  artifactsDir: string,\n  {\n    asyncMkdirp = defaultAsyncMkdirp,\n    asyncFsAccess = defaultAsyncFsAccess,\n  }: PrepareArtifactsDirOptions = {},\n): Promise<string> {\n  try {\n    const stats = await fs.stat(artifactsDir);\n    if (!stats.isDirectory()) {\n      throw new UsageError(\n        `--artifacts-dir=\"${artifactsDir}\" exists but it is not a directory.`);\n    }\n    // If the artifactsDir already exists, check that we have the write permissions on it.\n    try {\n      await asyncFsAccess(artifactsDir, fs.W_OK);\n    } catch (accessErr) {\n      if (isErrorWithCode('EACCES', accessErr)) {\n        throw new UsageError(\n          `--artifacts-dir=\"${artifactsDir}\" exists but the user lacks ` +\n          'permissions on it.');\n      } 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    } 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        } else {\n          throw mkdirErr;\n        }\n      }\n    } else {\n      throw error;\n    }\n  }\n\n  return artifactsDir;\n}\n"],"mappings":";AACA,SAAQA,EAAE,QAAO,IAAI;AACrB,OAAOC,kBAAkB,MAAM,QAAQ;AAEvC,SAAQC,UAAU,EAAEC,eAAe,QAAO,cAAc;AACxD,SAAQC,YAAY,QAAO,aAAa;AAExC,MAAMC,GAAG,GAAGD,YAAY,CAACE,MAAM,CAACC,IAAI,CAACC,GAAG,CAAC;AAEzC,MAAMC,oBAAsC,GAAGT,EAAE,CAACU,MAAM,CAACC,IAAI,CAACX,EAAE,CAAC;AAOjE,OAAO,eAAeY,mBAAmB,CACvCC,YAAoB,EACpB;EACEC,WAAW,GAAGb,kBAAkB;EAChCc,aAAa,GAAGN;AACU,CAAC,GAAG,CAAC,CAAC,EACjB;EACjB,IAAI;IACF,MAAMO,KAAK,GAAG,MAAMhB,EAAE,CAACiB,IAAI,CAACJ,YAAY,CAAC;IACzC,IAAI,CAACG,KAAK,CAACE,WAAW,EAAE,EAAE;MACxB,MAAM,IAAIhB,UAAU,CACjB,oBAAmBW,YAAa,qCAAoC,CAAC;IAC1E;IACA;IACA,IAAI;MACF,MAAME,aAAa,CAACF,YAAY,EAAEb,EAAE,CAACmB,IAAI,CAAC;IAC5C,CAAC,CAAC,OAAOC,SAAS,EAAE;MAClB,IAAIjB,eAAe,CAAC,QAAQ,EAAEiB,SAAS,CAAC,EAAE;QACxC,MAAM,IAAIlB,UAAU,CACjB,oBAAmBW,YAAa,8BAA6B,GAC9D,oBAAoB,CAAC;MACzB,CAAC,MAAM;QACL,MAAMO,SAAS;MACjB;IACF;EACF,CAAC,CAAC,OAAOC,KAAK,EAAE;IACd,IAAIlB,eAAe,CAAC,QAAQ,EAAEkB,KAAK,CAAC,EAAE;MACpC;MACA,MAAM,IAAInB,UAAU,CACjB,kCAAiCW,YAAa,qBAAoB,GAClE,sBAAqBQ,KAAM,EAAC,CAAC;IAClC,CAAC,MAAM,IAAIlB,eAAe,CAAC,QAAQ,EAAEkB,KAAK,CAAC,EAAE;MAC3C;MACA,IAAI;QACFhB,GAAG,CAACiB,KAAK,CAAE,iCAAgCT,YAAa,EAAC,CAAC;QAC1D,MAAMC,WAAW,CAACD,YAAY,CAAC;MACjC,CAAC,CAAC,OAAOU,QAAQ,EAAE;QACjB,IAAIpB,eAAe,CAAC,QAAQ,EAAEoB,QAAQ,CAAC,EAAE;UACvC;UACA,MAAM,IAAIrB,UAAU,CACjB,kCAAiCW,YAAa,gBAAe,GAC7D,2BAA0BU,QAAS,EAAC,CAAC;QAC1C,CAAC,MAAM;UACL,MAAMA,QAAQ;QAChB;MACF;IACF,CAAC,MAAM;MACL,MAAMF,KAAK;IACb;EACF;EAEA,OAAOR,YAAY;AACrB"}

package/lib/util/desktop-notifier.js

@@ -1,3 +1,4 @@
+
 import defaultNotifier from 'node-notifier';
 import { createLogger } from './logger.js';
 const defaultLog = createLogger(import.meta.url);

package/lib/util/desktop-notifier.js.map

@@ -1 +1 @@
-{"version":3,"file":"desktop-notifier.js","names":["defaultNotifier","createLogger","defaultLog","import","meta","url","showDesktopNotification","title","message","icon","notifier","log","Promise","resolve","reject","notify","err","res","debug"],"sources":["../../src/util/desktop-notifier.js"],"sourcesContent":["/* @flow */\nimport defaultNotifier from 'node-notifier';\n\nimport {createLogger} from './logger.js';\nimport type {Logger} from './logger';\n\nconst defaultLog = createLogger(import.meta.url);\n\nexport type DesktopNotificationsParams = {|\n  title: string,\n  message: string,\n  icon?: string,\n|};\n\nexport type DesktopNotificationsOptions = {\n  notifier?: typeof defaultNotifier,\n  log?: Logger,\n};\n\nexport function showDesktopNotification(\n  {\n    title, message, icon,\n  }: DesktopNotificationsParams,\n  {\n    notifier = defaultNotifier,\n    log = defaultLog,\n  }: DesktopNotificationsOptions = {}\n): Promise<void> {\n\n  return new Promise((resolve, reject) => {\n    notifier.notify({title, message, icon}, (err, res) => {\n      if (err) {\n        log.debug(`Desktop notifier error: ${err.message},` +\n                 ` response: ${res}`);\n        reject(err);\n      } else {\n        resolve();\n      }\n    });\n  });\n}\n"],"mappings":"AACA,OAAOA,eAAP,MAA4B,eAA5B;AAEA,SAAQC,YAAR,QAA2B,aAA3B;AAGA,MAAMC,UAAU,GAAGD,YAAY,CAACE,MAAM,CAACC,IAAP,CAAYC,GAAb,CAA/B;AAaA,OAAO,SAASC,uBAAT,CACL;EACEC,KADF;EACSC,OADT;EACkBC;AADlB,CADK,EAIL;EACEC,QAAQ,GAAGV,eADb;EAEEW,GAAG,GAAGT;AAFR,IAGiC,EAP5B,EAQU;EAEf,OAAO,IAAIU,OAAJ,CAAY,CAACC,OAAD,EAAUC,MAAV,KAAqB;IACtCJ,QAAQ,CAACK,MAAT,CAAgB;MAACR,KAAD;MAAQC,OAAR;MAAiBC;IAAjB,CAAhB,EAAwC,CAACO,GAAD,EAAMC,GAAN,KAAc;MACpD,IAAID,GAAJ,EAAS;QACPL,GAAG,CAACO,KAAJ,CAAW,2BAA0BF,GAAG,CAACR,OAAQ,GAAvC,GACA,cAAaS,GAAI,EAD3B;QAEAH,MAAM,CAACE,GAAD,CAAN;MACD,CAJD,MAIO;QACLH,OAAO;MACR;IACF,CARD;EASD,CAVM,CAAP;AAWD"}
+{"version":3,"file":"desktop-notifier.js","names":["defaultNotifier","createLogger","defaultLog","import","meta","url","showDesktopNotification","title","message","icon","notifier","log","Promise","resolve","reject","notify","err","res","debug"],"sources":["../../src/util/desktop-notifier.js"],"sourcesContent":["/* @flow */\nimport defaultNotifier from 'node-notifier';\n\nimport {createLogger} from './logger.js';\nimport type {Logger} from './logger';\n\nconst defaultLog = createLogger(import.meta.url);\n\nexport type DesktopNotificationsParams = {|\n  title: string,\n  message: string,\n  icon?: string,\n|};\n\nexport type DesktopNotificationsOptions = {\n  notifier?: typeof defaultNotifier,\n  log?: Logger,\n};\n\nexport function showDesktopNotification(\n  {\n    title, message, icon,\n  }: DesktopNotificationsParams,\n  {\n    notifier = defaultNotifier,\n    log = defaultLog,\n  }: DesktopNotificationsOptions = {}\n): Promise<void> {\n\n  return new Promise((resolve, reject) => {\n    notifier.notify({title, message, icon}, (err, res) => {\n      if (err) {\n        log.debug(`Desktop notifier error: ${err.message},` +\n                 ` response: ${res}`);\n        reject(err);\n      } else {\n        resolve();\n      }\n    });\n  });\n}\n"],"mappings":";AACA,OAAOA,eAAe,MAAM,eAAe;AAE3C,SAAQC,YAAY,QAAO,aAAa;AAGxC,MAAMC,UAAU,GAAGD,YAAY,CAACE,MAAM,CAACC,IAAI,CAACC,GAAG,CAAC;AAahD,OAAO,SAASC,uBAAuB,CACrC;EACEC,KAAK;EAAEC,OAAO;EAAEC;AACU,CAAC,EAC7B;EACEC,QAAQ,GAAGV,eAAe;EAC1BW,GAAG,GAAGT;AACqB,CAAC,GAAG,CAAC,CAAC,EACpB;EAEf,OAAO,IAAIU,OAAO,CAAC,CAACC,OAAO,EAAEC,MAAM,KAAK;IACtCJ,QAAQ,CAACK,MAAM,CAAC;MAACR,KAAK;MAAEC,OAAO;MAAEC;IAAI,CAAC,EAAE,CAACO,GAAG,EAAEC,GAAG,KAAK;MACpD,IAAID,GAAG,EAAE;QACPL,GAAG,CAACO,KAAK,CAAE,2BAA0BF,GAAG,CAACR,OAAQ,GAAE,GACzC,cAAaS,GAAI,EAAC,CAAC;QAC7BH,MAAM,CAACE,GAAG,CAAC;MACb,CAAC,MAAM;QACLH,OAAO,EAAE;MACX;IACF,CAAC,CAAC;EACJ,CAAC,CAAC;AACJ"}

package/lib/util/file-exists.js

@@ -1,6 +1,6 @@
+
 import { fs } from 'mz';
 import { isErrorWithCode } from '../errors.js';
-
 /*
  * Resolves true if the path is a readable file.
  *
@@ -23,7 +23,6 @@ export default async function fileExists(path, {
     if (isErrorWithCode(['EACCES', 'ENOENT'], error)) {
       return false;
     }
-
     throw error;
   }
 }

package/lib/util/file-exists.js.map

@@ -1 +1 @@
-{"version":3,"file":"file-exists.js","names":["fs","isErrorWithCode","fileExists","path","fileIsReadable","f","access","constants","R_OK","stat","isFile","error"],"sources":["../../src/util/file-exists.js"],"sourcesContent":["/* @flow */\nimport {fs} from 'mz';\n\nimport {isErrorWithCode} from '../errors.js';\n\ntype FileExistsOptions = {\n  fileIsReadable: (filePath: string) => Promise<boolean>,\n};\n\n/*\n * Resolves true if the path is a readable file.\n *\n * Usage:\n *\n * const exists = await fileExists(filePath);\n * if (exists) {\n *   // ...\n * }\n *\n * */\nexport default async function fileExists(\n  path: string,\n  {\n    fileIsReadable = (f) => fs.access(f, fs.constants.R_OK),\n  }: FileExistsOptions = {}\n): Promise<boolean> {\n  try {\n    await fileIsReadable(path);\n    const stat = await fs.stat(path);\n    return stat.isFile();\n  } catch (error) {\n    if (isErrorWithCode(['EACCES', 'ENOENT'], error)) {\n      return false;\n    }\n    throw error;\n  }\n}\n"],"mappings":"AACA,SAAQA,EAAR,QAAiB,IAAjB;AAEA,SAAQC,eAAR,QAA8B,cAA9B;;AAMA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,eAAe,eAAeC,UAAf,CACbC,IADa,EAEb;EACEC,cAAc,GAAIC,CAAD,IAAOL,EAAE,CAACM,MAAH,CAAUD,CAAV,EAAaL,EAAE,CAACO,SAAH,CAAaC,IAA1B;AAD1B,IAEuB,EAJV,EAKK;EAClB,IAAI;IACF,MAAMJ,cAAc,CAACD,IAAD,CAApB;IACA,MAAMM,IAAI,GAAG,MAAMT,EAAE,CAACS,IAAH,CAAQN,IAAR,CAAnB;IACA,OAAOM,IAAI,CAACC,MAAL,EAAP;EACD,CAJD,CAIE,OAAOC,KAAP,EAAc;IACd,IAAIV,eAAe,CAAC,CAAC,QAAD,EAAW,QAAX,CAAD,EAAuBU,KAAvB,CAAnB,EAAkD;MAChD,OAAO,KAAP;IACD;;IACD,MAAMA,KAAN;EACD;AACF"}
+{"version":3,"file":"file-exists.js","names":["fs","isErrorWithCode","fileExists","path","fileIsReadable","f","access","constants","R_OK","stat","isFile","error"],"sources":["../../src/util/file-exists.js"],"sourcesContent":["/* @flow */\nimport {fs} from 'mz';\n\nimport {isErrorWithCode} from '../errors.js';\n\ntype FileExistsOptions = {\n  fileIsReadable: (filePath: string) => Promise<boolean>,\n};\n\n/*\n * Resolves true if the path is a readable file.\n *\n * Usage:\n *\n * const exists = await fileExists(filePath);\n * if (exists) {\n *   // ...\n * }\n *\n * */\nexport default async function fileExists(\n  path: string,\n  {\n    fileIsReadable = (f) => fs.access(f, fs.constants.R_OK),\n  }: FileExistsOptions = {}\n): Promise<boolean> {\n  try {\n    await fileIsReadable(path);\n    const stat = await fs.stat(path);\n    return stat.isFile();\n  } catch (error) {\n    if (isErrorWithCode(['EACCES', 'ENOENT'], error)) {\n      return false;\n    }\n    throw error;\n  }\n}\n"],"mappings":";AACA,SAAQA,EAAE,QAAO,IAAI;AAErB,SAAQC,eAAe,QAAO,cAAc;AAM5C;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,eAAe,eAAeC,UAAU,CACtCC,IAAY,EACZ;EACEC,cAAc,GAAIC,CAAC,IAAKL,EAAE,CAACM,MAAM,CAACD,CAAC,EAAEL,EAAE,CAACO,SAAS,CAACC,IAAI;AACrC,CAAC,GAAG,CAAC,CAAC,EACP;EAClB,IAAI;IACF,MAAMJ,cAAc,CAACD,IAAI,CAAC;IAC1B,MAAMM,IAAI,GAAG,MAAMT,EAAE,CAACS,IAAI,CAACN,IAAI,CAAC;IAChC,OAAOM,IAAI,CAACC,MAAM,EAAE;EACtB,CAAC,CAAC,OAAOC,KAAK,EAAE;IACd,IAAIV,eAAe,CAAC,CAAC,QAAQ,EAAE,QAAQ,CAAC,EAAEU,KAAK,CAAC,EAAE;MAChD,OAAO,KAAK;IACd;IACA,MAAMA,KAAK;EACb;AACF"}

package/lib/util/file-filter.js

@@ -1,29 +1,33 @@
+
 import path from 'path';
 import multimatch from 'multimatch';
 import { createLogger } from './logger.js';
-const log = createLogger(import.meta.url); // check if target is a sub directory of src
+const log = createLogger(import.meta.url);
 
+// check if target is a sub directory of src
 export const isSubPath = (src, target) => {
-  const relate = path.relative(src, target); // same dir
-
+  const relate = path.relative(src, target);
+  // same dir
   if (!relate) {
     return false;
   }
-
   if (relate === '..') {
     return false;
   }
-
   return !relate.startsWith(`..${path.sep}`);
-}; // FileFilter types and implementation.
+};
+
+// FileFilter types and implementation.
 
 /*
  * Allows or ignores files.
  */
 export class FileFilter {
   constructor({
-    baseIgnoredPatterns = ['**/*.xpi', '**/*.zip', '**/.*', // any hidden file and folder
-    '**/.*/**/*', // and the content inside hidden folder
+    baseIgnoredPatterns = ['**/*.xpi', '**/*.zip', '**/.*',
+    // any hidden file and folder
+    '**/.*/**/*',
+    // and the content inside hidden folder
     '**/node_modules', '**/node_modules/**/*'],
     ignoreFiles = [],
     sourceDir,
@@ -33,32 +37,28 @@ export class FileFilter {
     this.filesToIgnore = [];
     this.sourceDir = sourceDir;
     this.addToIgnoreList(baseIgnoredPatterns);
-
     if (ignoreFiles) {
       this.addToIgnoreList(ignoreFiles);
     }
-
     if (artifactsDir && isSubPath(sourceDir, artifactsDir)) {
       artifactsDir = path.resolve(artifactsDir);
       log.debug(`Ignoring artifacts directory "${artifactsDir}" ` + 'and all its subdirectories');
       this.addToIgnoreList([artifactsDir, path.join(artifactsDir, '**', '*')]);
     }
   }
+
   /**
    *  Resolve relative path to absolute path with sourceDir.
    */
-
-
   resolveWithSourceDir(file) {
     const resolvedPath = path.resolve(this.sourceDir, file);
     log.debug(`Resolved path ${file} with sourceDir ${this.sourceDir} ` + `to ${resolvedPath}`);
     return resolvedPath;
   }
+
   /**
    *  Insert more files into filesToIgnore array.
    */
-
-
   addToIgnoreList(files) {
     for (const file of files) {
       if (file.charAt(0) === '!') {
@@ -69,6 +69,7 @@ export class FileFilter {
       }
     }
   }
+
   /*
    * Returns true if the file is wanted.
    *
@@ -79,21 +80,18 @@ export class FileFilter {
    * Example: this is called by zipdir as wantFile(filePath) for each
    * file in the folder that is being archived.
    */
-
-
   wantFile(filePath) {
     const resolvedPath = this.resolveWithSourceDir(filePath);
     const matches = multimatch(resolvedPath, this.filesToIgnore);
-
     if (matches.length > 0) {
       log.debug(`FileFilter: ignoring file ${resolvedPath}`);
       return false;
     }
-
     return true;
   }
+}
 
-} // a helper function to make mocking easier
+// a helper function to make mocking easier
 
 export const createFileFilter = params => new FileFilter(params);
 //# sourceMappingURL=file-filter.js.map

package/lib/util/file-filter.js.map

@@ -1 +1 @@
-{"version":3,"file":"file-filter.js","names":["path","multimatch","createLogger","log","import","meta","url","isSubPath","src","target","relate","relative","startsWith","sep","FileFilter","constructor","baseIgnoredPatterns","ignoreFiles","sourceDir","artifactsDir","resolve","filesToIgnore","addToIgnoreList","debug","join","resolveWithSourceDir","file","resolvedPath","files","charAt","resolvedFile","substr","push","wantFile","filePath","matches","length","createFileFilter","params"],"sources":["../../src/util/file-filter.js"],"sourcesContent":["/* @flow */\nimport path from 'path';\n\nimport multimatch from 'multimatch';\n\nimport {createLogger} from './logger.js';\n\nconst log = createLogger(import.meta.url);\n\n// check if target is a sub directory of src\nexport const isSubPath = (src: string, target: string): boolean => {\n  const relate = path.relative(src, target);\n  // same dir\n  if (!relate) {\n    return false;\n  }\n  if (relate === '..') {\n    return false;\n  }\n  return !relate.startsWith(`..${path.sep}`);\n};\n\n// FileFilter types and implementation.\n\nexport type FileFilterOptions = {\n  baseIgnoredPatterns?: Array<string>,\n  ignoreFiles?: Array<string>,\n  sourceDir: string,\n  artifactsDir?: string,\n};\n\n/*\n * Allows or ignores files.\n */\nexport class FileFilter {\n  filesToIgnore: Array<string>;\n  sourceDir: string;\n\n  constructor({\n    baseIgnoredPatterns = [\n      '**/*.xpi',\n      '**/*.zip',\n      '**/.*', // any hidden file and folder\n      '**/.*/**/*', // and the content inside hidden folder\n      '**/node_modules',\n      '**/node_modules/**/*',\n    ],\n    ignoreFiles = [],\n    sourceDir,\n    artifactsDir,\n  }: FileFilterOptions = {}) {\n    sourceDir = path.resolve(sourceDir);\n\n    this.filesToIgnore = [];\n    this.sourceDir = sourceDir;\n\n    this.addToIgnoreList(baseIgnoredPatterns);\n    if (ignoreFiles) {\n      this.addToIgnoreList(ignoreFiles);\n    }\n    if (artifactsDir && isSubPath(sourceDir, artifactsDir)) {\n      artifactsDir = path.resolve(artifactsDir);\n      log.debug(\n        `Ignoring artifacts directory \"${artifactsDir}\" ` +\n        'and all its subdirectories'\n      );\n      this.addToIgnoreList([\n        artifactsDir,\n        path.join(artifactsDir, '**', '*'),\n      ]);\n    }\n  }\n\n  /**\n   *  Resolve relative path to absolute path with sourceDir.\n   */\n  resolveWithSourceDir(file: string): string {\n    const resolvedPath = path.resolve(this.sourceDir, file);\n    log.debug(\n      `Resolved path ${file} with sourceDir ${this.sourceDir} ` +\n      `to ${resolvedPath}`\n    );\n    return resolvedPath;\n  }\n\n  /**\n   *  Insert more files into filesToIgnore array.\n   */\n  addToIgnoreList(files: Array<string>) {\n    for (const file of files) {\n      if (file.charAt(0) === '!') {\n        const resolvedFile = this.resolveWithSourceDir(file.substr(1));\n        this.filesToIgnore.push(`!${resolvedFile}`);\n      } else {\n        this.filesToIgnore.push(this.resolveWithSourceDir(file));\n      }\n    }\n  }\n\n  /*\n   * Returns true if the file is wanted.\n   *\n   * If filePath does not start with a slash, it will be treated as a path\n   * relative to sourceDir when matching it against all configured\n   * ignore-patterns.\n   *\n   * Example: this is called by zipdir as wantFile(filePath) for each\n   * file in the folder that is being archived.\n   */\n  wantFile(filePath: string): boolean {\n    const resolvedPath = this.resolveWithSourceDir(filePath);\n    const matches = multimatch(resolvedPath, this.filesToIgnore);\n    if (matches.length > 0) {\n      log.debug(`FileFilter: ignoring file ${resolvedPath}`);\n      return false;\n    }\n    return true;\n  }\n}\n\n// a helper function to make mocking easier\n\nexport const createFileFilter = (\n  (params: FileFilterOptions): FileFilter => new FileFilter(params)\n);\n\nexport type FileFilterCreatorFn = typeof createFileFilter;\n"],"mappings":"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"}
+{"version":3,"file":"file-filter.js","names":["path","multimatch","createLogger","log","import","meta","url","isSubPath","src","target","relate","relative","startsWith","sep","FileFilter","constructor","baseIgnoredPatterns","ignoreFiles","sourceDir","artifactsDir","resolve","filesToIgnore","addToIgnoreList","debug","join","resolveWithSourceDir","file","resolvedPath","files","charAt","resolvedFile","substr","push","wantFile","filePath","matches","length","createFileFilter","params"],"sources":["../../src/util/file-filter.js"],"sourcesContent":["/* @flow */\nimport path from 'path';\n\nimport multimatch from 'multimatch';\n\nimport {createLogger} from './logger.js';\n\nconst log = createLogger(import.meta.url);\n\n// check if target is a sub directory of src\nexport const isSubPath = (src: string, target: string): boolean => {\n  const relate = path.relative(src, target);\n  // same dir\n  if (!relate) {\n    return false;\n  }\n  if (relate === '..') {\n    return false;\n  }\n  return !relate.startsWith(`..${path.sep}`);\n};\n\n// FileFilter types and implementation.\n\nexport type FileFilterOptions = {\n  baseIgnoredPatterns?: Array<string>,\n  ignoreFiles?: Array<string>,\n  sourceDir: string,\n  artifactsDir?: string,\n};\n\n/*\n * Allows or ignores files.\n */\nexport class FileFilter {\n  filesToIgnore: Array<string>;\n  sourceDir: string;\n\n  constructor({\n    baseIgnoredPatterns = [\n      '**/*.xpi',\n      '**/*.zip',\n      '**/.*', // any hidden file and folder\n      '**/.*/**/*', // and the content inside hidden folder\n      '**/node_modules',\n      '**/node_modules/**/*',\n    ],\n    ignoreFiles = [],\n    sourceDir,\n    artifactsDir,\n  }: FileFilterOptions = {}) {\n    sourceDir = path.resolve(sourceDir);\n\n    this.filesToIgnore = [];\n    this.sourceDir = sourceDir;\n\n    this.addToIgnoreList(baseIgnoredPatterns);\n    if (ignoreFiles) {\n      this.addToIgnoreList(ignoreFiles);\n    }\n    if (artifactsDir && isSubPath(sourceDir, artifactsDir)) {\n      artifactsDir = path.resolve(artifactsDir);\n      log.debug(\n        `Ignoring artifacts directory \"${artifactsDir}\" ` +\n        'and all its subdirectories'\n      );\n      this.addToIgnoreList([\n        artifactsDir,\n        path.join(artifactsDir, '**', '*'),\n      ]);\n    }\n  }\n\n  /**\n   *  Resolve relative path to absolute path with sourceDir.\n   */\n  resolveWithSourceDir(file: string): string {\n    const resolvedPath = path.resolve(this.sourceDir, file);\n    log.debug(\n      `Resolved path ${file} with sourceDir ${this.sourceDir} ` +\n      `to ${resolvedPath}`\n    );\n    return resolvedPath;\n  }\n\n  /**\n   *  Insert more files into filesToIgnore array.\n   */\n  addToIgnoreList(files: Array<string>) {\n    for (const file of files) {\n      if (file.charAt(0) === '!') {\n        const resolvedFile = this.resolveWithSourceDir(file.substr(1));\n        this.filesToIgnore.push(`!${resolvedFile}`);\n      } else {\n        this.filesToIgnore.push(this.resolveWithSourceDir(file));\n      }\n    }\n  }\n\n  /*\n   * Returns true if the file is wanted.\n   *\n   * If filePath does not start with a slash, it will be treated as a path\n   * relative to sourceDir when matching it against all configured\n   * ignore-patterns.\n   *\n   * Example: this is called by zipdir as wantFile(filePath) for each\n   * file in the folder that is being archived.\n   */\n  wantFile(filePath: string): boolean {\n    const resolvedPath = this.resolveWithSourceDir(filePath);\n    const matches = multimatch(resolvedPath, this.filesToIgnore);\n    if (matches.length > 0) {\n      log.debug(`FileFilter: ignoring file ${resolvedPath}`);\n      return false;\n    }\n    return true;\n  }\n}\n\n// a helper function to make mocking easier\n\nexport const createFileFilter = (\n  (params: FileFilterOptions): FileFilter => new FileFilter(params)\n);\n\nexport type FileFilterCreatorFn = typeof createFileFilter;\n"],"mappings":"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"}

package/lib/util/is-directory.js

@@ -1,5 +1,7 @@
+
 import { fs } from 'mz';
 import { onlyErrorsWithCode } from '../errors.js';
+
 /*
  * Resolves true if the path is a readable directory.
  *
@@ -11,7 +13,6 @@ import { onlyErrorsWithCode } from '../errors.js';
  *  });
  *
  * */
-
 export default function isDirectory(path) {
   return fs.stat(path).then(stats => stats.isDirectory()).catch(onlyErrorsWithCode(['ENOENT', 'ENOTDIR'], () => {
     return false;

package/lib/util/is-directory.js.map

@@ -1 +1 @@
-{"version":3,"file":"is-directory.js","names":["fs","onlyErrorsWithCode","isDirectory","path","stat","then","stats","catch"],"sources":["../../src/util/is-directory.js"],"sourcesContent":["/* @flow */\nimport {fs} from 'mz';\n\nimport {onlyErrorsWithCode} from '../errors.js';\n\n/*\n * Resolves true if the path is a readable directory.\n *\n * Usage:\n *\n * isDirectory('/some/path')\n *  .then((dirExists) => {\n *    // dirExists will be true or false.\n *  });\n *\n * */\nexport default function isDirectory(path: string): Promise<boolean> {\n  return fs.stat(path)\n    .then((stats) => stats.isDirectory())\n    .catch(onlyErrorsWithCode(['ENOENT', 'ENOTDIR'], () => {\n      return false;\n    }));\n}\n"],"mappings":"AACA,SAAQA,EAAR,QAAiB,IAAjB;AAEA,SAAQC,kBAAR,QAAiC,cAAjC;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AACA,eAAe,SAASC,WAAT,CAAqBC,IAArB,EAAqD;EAClE,OAAOH,EAAE,CAACI,IAAH,CAAQD,IAAR,EACJE,IADI,CACEC,KAAD,IAAWA,KAAK,CAACJ,WAAN,EADZ,EAEJK,KAFI,CAEEN,kBAAkB,CAAC,CAAC,QAAD,EAAW,SAAX,CAAD,EAAwB,MAAM;IACrD,OAAO,KAAP;EACD,CAFwB,CAFpB,CAAP;AAKD"}
+{"version":3,"file":"is-directory.js","names":["fs","onlyErrorsWithCode","isDirectory","path","stat","then","stats","catch"],"sources":["../../src/util/is-directory.js"],"sourcesContent":["/* @flow */\nimport {fs} from 'mz';\n\nimport {onlyErrorsWithCode} from '../errors.js';\n\n/*\n * Resolves true if the path is a readable directory.\n *\n * Usage:\n *\n * isDirectory('/some/path')\n *  .then((dirExists) => {\n *    // dirExists will be true or false.\n *  });\n *\n * */\nexport default function isDirectory(path: string): Promise<boolean> {\n  return fs.stat(path)\n    .then((stats) => stats.isDirectory())\n    .catch(onlyErrorsWithCode(['ENOENT', 'ENOTDIR'], () => {\n      return false;\n    }));\n}\n"],"mappings":";AACA,SAAQA,EAAE,QAAO,IAAI;AAErB,SAAQC,kBAAkB,QAAO,cAAc;;AAE/C;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,eAAe,SAASC,WAAW,CAACC,IAAY,EAAoB;EAClE,OAAOH,EAAE,CAACI,IAAI,CAACD,IAAI,CAAC,CACjBE,IAAI,CAAEC,KAAK,IAAKA,KAAK,CAACJ,WAAW,EAAE,CAAC,CACpCK,KAAK,CAACN,kBAAkB,CAAC,CAAC,QAAQ,EAAE,SAAS,CAAC,EAAE,MAAM;IACrD,OAAO,KAAK;EACd,CAAC,CAAC,CAAC;AACP"}

package/lib/util/logger.js

@@ -1,5 +1,8 @@
+
 import { fileURLToPath } from 'url';
-import bunyan, { nameFromLevel, createLogger as defaultLogCreator } from 'bunyan'; // Bunyan-related Flow types
+import bunyan, { nameFromLevel, createLogger as defaultLogCreator } from 'bunyan';
+
+// Bunyan-related Flow types
 
 export class ConsoleStream {
   constructor({
@@ -9,7 +12,6 @@ export class ConsoleStream {
     this.isCapturing = false;
     this.capturedMessages = [];
   }
-
   format({
     name,
     msg,
@@ -18,19 +20,15 @@ export class ConsoleStream {
     const prefix = this.verbose ? `[${name}][${nameFromLevel[level]}] ` : '';
     return `${prefix}${msg}\n`;
   }
-
   makeVerbose() {
     this.verbose = true;
   }
-
   write(packet, {
     localProcess = process
   } = {}) {
     const thisLevel = this.verbose ? bunyan.TRACE : bunyan.INFO;
-
     if (packet.level >= thisLevel) {
       const msg = this.format(packet);
-
       if (this.isCapturing) {
         this.capturedMessages.push(msg);
       } else {
@@ -38,28 +36,25 @@ export class ConsoleStream {
       }
     }
   }
-
   startCapturing() {
     this.isCapturing = true;
   }
-
   stopCapturing() {
     this.isCapturing = false;
     this.capturedMessages = [];
   }
-
   flushCapturedLogs({
     localProcess = process
   } = {}) {
     for (const msg of this.capturedMessages) {
       localProcess.stdout.write(msg);
     }
-
     this.capturedMessages = [];
   }
-
 }
-export const consoleStream = new ConsoleStream(); // createLogger types and implementation.
+export const consoleStream = new ConsoleStream();
+
+// createLogger types and implementation.
 
 export function createLogger(moduleURL, {
   createBunyanLog = defaultLogCreator

package/lib/util/logger.js.map

@@ -1 +1 @@
-{"version":3,"file":"logger.js","names":["fileURLToPath","bunyan","nameFromLevel","createLogger","defaultLogCreator","ConsoleStream","constructor","verbose","isCapturing","capturedMessages","format","name","msg","level","prefix","makeVerbose","write","packet","localProcess","process","thisLevel","TRACE","INFO","push","stdout","startCapturing","stopCapturing","flushCapturedLogs","consoleStream","moduleURL","createBunyanLog","replace","streams","type","stream"],"sources":["../../src/util/logger.js"],"sourcesContent":["/* @flow */\nimport { fileURLToPath } from 'url';\n\nimport bunyan, {nameFromLevel, createLogger as defaultLogCreator}\n  from 'bunyan';\n\n// Bunyan-related Flow types\n\nexport type TRACE = 10;\nexport type DEBUG = 20;\nexport type INFO = 30;\nexport type WARN = 40;\nexport type ERROR = 50;\nexport type FATAL = 60;\n\nexport type BunyanLogLevel =\n  TRACE | DEBUG | INFO | WARN | ERROR | FATAL;\n\nexport type BunyanLogEntry = {|\n  name: string,\n  msg: string,\n  level: BunyanLogLevel,\n|};\n\nexport type Logger = {\n  debug: (msg: string, ...args: any) => void,\n  error: (msg: string, ...args: any) => void,\n  info: (msg: string, ...args: any) => void,\n  warn: (msg: string, ...args: any) => void,\n};\n\n\n// ConsoleStream types and implementation.\n\nexport type ConsoleStreamParams = {\n  verbose?: boolean,\n};\n\nexport type ConsoleOptions = {\n  localProcess?: typeof process,\n};\n\nexport class ConsoleStream {\n  verbose: boolean;\n  isCapturing: boolean;\n  capturedMessages: Array<string>;\n\n  constructor({verbose = false}: ConsoleStreamParams = {}) {\n    this.verbose = verbose;\n    this.isCapturing = false;\n    this.capturedMessages = [];\n  }\n\n  format({name, msg, level}: BunyanLogEntry): string {\n    const prefix = this.verbose ? `[${name}][${nameFromLevel[level]}] ` : '';\n    return `${prefix}${msg}\\n`;\n  }\n\n  makeVerbose() {\n    this.verbose = true;\n  }\n\n  write(\n    packet: BunyanLogEntry,\n    {localProcess = process}: ConsoleOptions = {}\n  ): void {\n    const thisLevel: BunyanLogLevel = this.verbose ? bunyan.TRACE : bunyan.INFO;\n    if (packet.level >= thisLevel) {\n      const msg = this.format(packet);\n      if (this.isCapturing) {\n        this.capturedMessages.push(msg);\n      } else {\n        localProcess.stdout.write(msg);\n      }\n    }\n  }\n\n  startCapturing() {\n    this.isCapturing = true;\n  }\n\n  stopCapturing() {\n    this.isCapturing = false;\n    this.capturedMessages = [];\n  }\n\n  flushCapturedLogs({localProcess = process}: ConsoleOptions = {}) {\n    for (const msg of this.capturedMessages) {\n      localProcess.stdout.write(msg);\n    }\n    this.capturedMessages = [];\n  }\n}\n\nexport const consoleStream: ConsoleStream = new ConsoleStream();\n\n\n// createLogger types and implementation.\n\nexport type BunyanStreamConfig = {\n  type: string,\n  stream: ConsoleStream,\n};\n\nexport type CreateBunyanLogParams = {\n  name: string,\n  level: BunyanLogLevel,\n  streams: Array<BunyanStreamConfig>,\n};\n\nexport type CreateBunyanLogFn = (params: CreateBunyanLogParams) => Logger;\n\nexport type CreateLoggerOptions = {\n  createBunyanLog: CreateBunyanLogFn,\n};\n\nexport function createLogger(\n  moduleURL?: string,\n  {createBunyanLog = defaultLogCreator}: CreateLoggerOptions = {}\n): Logger {\n  return createBunyanLog({\n    // Strip the leading src/ from file names (which is in all file names) to\n    // make the name less redundant.\n    name: moduleURL\n      ? fileURLToPath(moduleURL).replace(/^src\\//, '')\n      : 'unknown-module',\n    // Capture all log levels and let the stream filter them.\n    level: bunyan.TRACE,\n    streams: [{\n      type: 'raw',\n      stream: consoleStream,\n    }],\n  });\n}\n"],"mappings":"AACA,SAASA,aAAT,QAA8B,KAA9B;AAEA,OAAOC,MAAP,IAAgBC,aAAhB,EAA+BC,YAAY,IAAIC,iBAA/C,QACO,QADP,C,CAGA;;AAoCA,OAAO,MAAMC,aAAN,CAAoB;EAKzBC,WAAW,CAAC;IAACC,OAAO,GAAG;EAAX,IAAyC,EAA1C,EAA8C;IACvD,KAAKA,OAAL,GAAeA,OAAf;IACA,KAAKC,WAAL,GAAmB,KAAnB;IACA,KAAKC,gBAAL,GAAwB,EAAxB;EACD;;EAEDC,MAAM,CAAC;IAACC,IAAD;IAAOC,GAAP;IAAYC;EAAZ,CAAD,EAA6C;IACjD,MAAMC,MAAM,GAAG,KAAKP,OAAL,GAAgB,IAAGI,IAAK,KAAIT,aAAa,CAACW,KAAD,CAAQ,IAAjD,GAAuD,EAAtE;IACA,OAAQ,GAAEC,MAAO,GAAEF,GAAI,IAAvB;EACD;;EAEDG,WAAW,GAAG;IACZ,KAAKR,OAAL,GAAe,IAAf;EACD;;EAEDS,KAAK,CACHC,MADG,EAEH;IAACC,YAAY,GAAGC;EAAhB,IAA2C,EAFxC,EAGG;IACN,MAAMC,SAAyB,GAAG,KAAKb,OAAL,GAAeN,MAAM,CAACoB,KAAtB,GAA8BpB,MAAM,CAACqB,IAAvE;;IACA,IAAIL,MAAM,CAACJ,KAAP,IAAgBO,SAApB,EAA+B;MAC7B,MAAMR,GAAG,GAAG,KAAKF,MAAL,CAAYO,MAAZ,CAAZ;;MACA,IAAI,KAAKT,WAAT,EAAsB;QACpB,KAAKC,gBAAL,CAAsBc,IAAtB,CAA2BX,GAA3B;MACD,CAFD,MAEO;QACLM,YAAY,CAACM,MAAb,CAAoBR,KAApB,CAA0BJ,GAA1B;MACD;IACF;EACF;;EAEDa,cAAc,GAAG;IACf,KAAKjB,WAAL,GAAmB,IAAnB;EACD;;EAEDkB,aAAa,GAAG;IACd,KAAKlB,WAAL,GAAmB,KAAnB;IACA,KAAKC,gBAAL,GAAwB,EAAxB;EACD;;EAEDkB,iBAAiB,CAAC;IAACT,YAAY,GAAGC;EAAhB,IAA2C,EAA5C,EAAgD;IAC/D,KAAK,MAAMP,GAAX,IAAkB,KAAKH,gBAAvB,EAAyC;MACvCS,YAAY,CAACM,MAAb,CAAoBR,KAApB,CAA0BJ,GAA1B;IACD;;IACD,KAAKH,gBAAL,GAAwB,EAAxB;EACD;;AAjDwB;AAoD3B,OAAO,MAAMmB,aAA4B,GAAG,IAAIvB,aAAJ,EAArC,C,CAGP;;AAmBA,OAAO,SAASF,YAAT,CACL0B,SADK,EAEL;EAACC,eAAe,GAAG1B;AAAnB,IAA6D,EAFxD,EAGG;EACR,OAAO0B,eAAe,CAAC;IACrB;IACA;IACAnB,IAAI,EAAEkB,SAAS,GACX7B,aAAa,CAAC6B,SAAD,CAAb,CAAyBE,OAAzB,CAAiC,QAAjC,EAA2C,EAA3C,CADW,GAEX,gBALiB;IAMrB;IACAlB,KAAK,EAAEZ,MAAM,CAACoB,KAPO;IAQrBW,OAAO,EAAE,CAAC;MACRC,IAAI,EAAE,KADE;MAERC,MAAM,EAAEN;IAFA,CAAD;EARY,CAAD,CAAtB;AAaD"}
+{"version":3,"file":"logger.js","names":["fileURLToPath","bunyan","nameFromLevel","createLogger","defaultLogCreator","ConsoleStream","constructor","verbose","isCapturing","capturedMessages","format","name","msg","level","prefix","makeVerbose","write","packet","localProcess","process","thisLevel","TRACE","INFO","push","stdout","startCapturing","stopCapturing","flushCapturedLogs","consoleStream","moduleURL","createBunyanLog","replace","streams","type","stream"],"sources":["../../src/util/logger.js"],"sourcesContent":["/* @flow */\nimport { fileURLToPath } from 'url';\n\nimport bunyan, {nameFromLevel, createLogger as defaultLogCreator}\n  from 'bunyan';\n\n// Bunyan-related Flow types\n\nexport type TRACE = 10;\nexport type DEBUG = 20;\nexport type INFO = 30;\nexport type WARN = 40;\nexport type ERROR = 50;\nexport type FATAL = 60;\n\nexport type BunyanLogLevel =\n  TRACE | DEBUG | INFO | WARN | ERROR | FATAL;\n\nexport type BunyanLogEntry = {|\n  name: string,\n  msg: string,\n  level: BunyanLogLevel,\n|};\n\nexport type Logger = {\n  debug: (msg: string, ...args: any) => void,\n  error: (msg: string, ...args: any) => void,\n  info: (msg: string, ...args: any) => void,\n  warn: (msg: string, ...args: any) => void,\n};\n\n\n// ConsoleStream types and implementation.\n\nexport type ConsoleStreamParams = {\n  verbose?: boolean,\n};\n\nexport type ConsoleOptions = {\n  localProcess?: typeof process,\n};\n\nexport class ConsoleStream {\n  verbose: boolean;\n  isCapturing: boolean;\n  capturedMessages: Array<string>;\n\n  constructor({verbose = false}: ConsoleStreamParams = {}) {\n    this.verbose = verbose;\n    this.isCapturing = false;\n    this.capturedMessages = [];\n  }\n\n  format({name, msg, level}: BunyanLogEntry): string {\n    const prefix = this.verbose ? `[${name}][${nameFromLevel[level]}] ` : '';\n    return `${prefix}${msg}\\n`;\n  }\n\n  makeVerbose() {\n    this.verbose = true;\n  }\n\n  write(\n    packet: BunyanLogEntry,\n    {localProcess = process}: ConsoleOptions = {}\n  ): void {\n    const thisLevel: BunyanLogLevel = this.verbose ? bunyan.TRACE : bunyan.INFO;\n    if (packet.level >= thisLevel) {\n      const msg = this.format(packet);\n      if (this.isCapturing) {\n        this.capturedMessages.push(msg);\n      } else {\n        localProcess.stdout.write(msg);\n      }\n    }\n  }\n\n  startCapturing() {\n    this.isCapturing = true;\n  }\n\n  stopCapturing() {\n    this.isCapturing = false;\n    this.capturedMessages = [];\n  }\n\n  flushCapturedLogs({localProcess = process}: ConsoleOptions = {}) {\n    for (const msg of this.capturedMessages) {\n      localProcess.stdout.write(msg);\n    }\n    this.capturedMessages = [];\n  }\n}\n\nexport const consoleStream: ConsoleStream = new ConsoleStream();\n\n\n// createLogger types and implementation.\n\nexport type BunyanStreamConfig = {\n  type: string,\n  stream: ConsoleStream,\n};\n\nexport type CreateBunyanLogParams = {\n  name: string,\n  level: BunyanLogLevel,\n  streams: Array<BunyanStreamConfig>,\n};\n\nexport type CreateBunyanLogFn = (params: CreateBunyanLogParams) => Logger;\n\nexport type CreateLoggerOptions = {\n  createBunyanLog: CreateBunyanLogFn,\n};\n\nexport function createLogger(\n  moduleURL?: string,\n  {createBunyanLog = defaultLogCreator}: CreateLoggerOptions = {}\n): Logger {\n  return createBunyanLog({\n    // Strip the leading src/ from file names (which is in all file names) to\n    // make the name less redundant.\n    name: moduleURL\n      ? fileURLToPath(moduleURL).replace(/^src\\//, '')\n      : 'unknown-module',\n    // Capture all log levels and let the stream filter them.\n    level: bunyan.TRACE,\n    streams: [{\n      type: 'raw',\n      stream: consoleStream,\n    }],\n  });\n}\n"],"mappings":";AACA,SAASA,aAAa,QAAQ,KAAK;AAEnC,OAAOC,MAAM,IAAGC,aAAa,EAAEC,YAAY,IAAIC,iBAAiB,QACzD,QAAQ;;AAEf;;AAoCA,OAAO,MAAMC,aAAa,CAAC;EAKzBC,WAAW,CAAC;IAACC,OAAO,GAAG;EAA0B,CAAC,GAAG,CAAC,CAAC,EAAE;IACvD,IAAI,CAACA,OAAO,GAAGA,OAAO;IACtB,IAAI,CAACC,WAAW,GAAG,KAAK;IACxB,IAAI,CAACC,gBAAgB,GAAG,EAAE;EAC5B;EAEAC,MAAM,CAAC;IAACC,IAAI;IAAEC,GAAG;IAAEC;EAAqB,CAAC,EAAU;IACjD,MAAMC,MAAM,GAAG,IAAI,CAACP,OAAO,GAAI,IAAGI,IAAK,KAAIT,aAAa,CAACW,KAAK,CAAE,IAAG,GAAG,EAAE;IACxE,OAAQ,GAAEC,MAAO,GAAEF,GAAI,IAAG;EAC5B;EAEAG,WAAW,GAAG;IACZ,IAAI,CAACR,OAAO,GAAG,IAAI;EACrB;EAEAS,KAAK,CACHC,MAAsB,EACtB;IAACC,YAAY,GAAGC;EAAuB,CAAC,GAAG,CAAC,CAAC,EACvC;IACN,MAAMC,SAAyB,GAAG,IAAI,CAACb,OAAO,GAAGN,MAAM,CAACoB,KAAK,GAAGpB,MAAM,CAACqB,IAAI;IAC3E,IAAIL,MAAM,CAACJ,KAAK,IAAIO,SAAS,EAAE;MAC7B,MAAMR,GAAG,GAAG,IAAI,CAACF,MAAM,CAACO,MAAM,CAAC;MAC/B,IAAI,IAAI,CAACT,WAAW,EAAE;QACpB,IAAI,CAACC,gBAAgB,CAACc,IAAI,CAACX,GAAG,CAAC;MACjC,CAAC,MAAM;QACLM,YAAY,CAACM,MAAM,CAACR,KAAK,CAACJ,GAAG,CAAC;MAChC;IACF;EACF;EAEAa,cAAc,GAAG;IACf,IAAI,CAACjB,WAAW,GAAG,IAAI;EACzB;EAEAkB,aAAa,GAAG;IACd,IAAI,CAAClB,WAAW,GAAG,KAAK;IACxB,IAAI,CAACC,gBAAgB,GAAG,EAAE;EAC5B;EAEAkB,iBAAiB,CAAC;IAACT,YAAY,GAAGC;EAAuB,CAAC,GAAG,CAAC,CAAC,EAAE;IAC/D,KAAK,MAAMP,GAAG,IAAI,IAAI,CAACH,gBAAgB,EAAE;MACvCS,YAAY,CAACM,MAAM,CAACR,KAAK,CAACJ,GAAG,CAAC;IAChC;IACA,IAAI,CAACH,gBAAgB,GAAG,EAAE;EAC5B;AACF;AAEA,OAAO,MAAMmB,aAA4B,GAAG,IAAIvB,aAAa,EAAE;;AAG/D;;AAmBA,OAAO,SAASF,YAAY,CAC1B0B,SAAkB,EAClB;EAACC,eAAe,GAAG1B;AAAsC,CAAC,GAAG,CAAC,CAAC,EACvD;EACR,OAAO0B,eAAe,CAAC;IACrB;IACA;IACAnB,IAAI,EAAEkB,SAAS,GACX7B,aAAa,CAAC6B,SAAS,CAAC,CAACE,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,GAC9C,gBAAgB;IACpB;IACAlB,KAAK,EAAEZ,MAAM,CAACoB,KAAK;IACnBW,OAAO,EAAE,CAAC;MACRC,IAAI,EAAE,KAAK;MACXC,MAAM,EAAEN;IACV,CAAC;EACH,CAAC,CAAC;AACJ"}

package/lib/util/manifest.js

@@ -1,3 +1,4 @@
+
 import path from 'path';
 import { fs } from 'mz';
 import parseJSON from 'parse-json';
@@ -5,13 +6,14 @@ import stripBom from 'strip-bom';
 import stripJsonComments from 'strip-json-comments';
 import { InvalidManifest } from '../errors.js';
 import { createLogger } from './logger.js';
-const log = createLogger(import.meta.url); // getValidatedManifest helper types and implementation
+const log = createLogger(import.meta.url);
+
+// getValidatedManifest helper types and implementation
 
 export default async function getValidatedManifest(sourceDir) {
   const manifestFile = path.join(sourceDir, 'manifest.json');
   log.debug(`Validating manifest at ${manifestFile}`);
   let manifestContents;
-
   try {
     manifestContents = await fs.readFile(manifestFile, {
       encoding: 'utf-8'
@@ -19,44 +21,36 @@ export default async function getValidatedManifest(sourceDir) {
   } catch (error) {
     throw new InvalidManifest(`Could not read manifest.json file at ${manifestFile}: ${error}`);
   }
-
   manifestContents = stripBom(manifestContents);
   let manifestData;
-
   try {
     manifestData = parseJSON(stripJsonComments(manifestContents));
   } catch (error) {
     throw new InvalidManifest(`Error parsing manifest.json file at ${manifestFile}: ${error}`);
   }
-
-  const errors = []; // This is just some basic validation of what web-ext needs, not
+  const errors = [];
+  // This is just some basic validation of what web-ext needs, not
   // what Firefox will need to run the extension.
   // TODO: integrate with the addons-linter for actual validation.
-
   if (!manifestData.name) {
     errors.push('missing "name" property');
   }
-
   if (!manifestData.version) {
     errors.push('missing "version" property');
   }
-
   if (manifestData.applications && !manifestData.applications.gecko) {
     // Since the applications property only applies to gecko, make
     // sure 'gecko' exists when 'applications' is defined. This should
     // make introspection of gecko properties easier.
     errors.push('missing "applications.gecko" property');
   }
-
   if (errors.length) {
     throw new InvalidManifest(`Manifest at ${manifestFile} is invalid: ${errors.join('; ')}`);
   }
-
   return manifestData;
 }
 export function getManifestId(manifestData) {
   const manifestApps = [manifestData.browser_specific_settings, manifestData.applications];
-
   for (const apps of manifestApps) {
     // If both bss and applicants contains a defined gecko property,
     // we prefer bss even if the id property isn't available.
@@ -66,7 +60,6 @@ export function getManifestId(manifestData) {
       return apps.gecko.id;
     }
   }
-
   return undefined;
 }
 //# sourceMappingURL=manifest.js.map