fix: set filesize for resource files

Fixes #739.

.github/FUNDING.yml

@@ -0,0 +1 @@
+custom: https://www.paypal.me/calebsboyd

.github/ISSUE_TEMPLATE/bug-report.md

@@ -0,0 +1,23 @@
+---
+name: Bug Report
+about: Report a bug encountered while running Nexe
+labels: bug
+
+---
+<!-- Please use this template while reporting a bug and provide as much info as possible. Not doing so may result in your bug not being addressed in a timely manner. Thanks!
+-->
+
+**What happened**:
+
+**What you expected to happen**:
+
+**How to reproduce it (as minimally and precisely as possible)**:
+
+**Anything else we need to know?**:
+
+**Environment**:
+- Platform(OS/Version):
+- Host Node Version:
+- Target Node Version:
+- Nexe version:
+- Python Version:

.github/ISSUE_TEMPLATE/feature.md

@@ -0,0 +1,11 @@
+---
+name: Feature Request
+about: Suggest an feature request
+labels: feature
+
+---
+<!-- Please only use this template for submitting feature requests -->
+
+**What would you like to be added**:
+
+**Why is this needed**:

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,11 @@
+**What this PR does / why we need it**:
+
+**Which issue(s) this PR fixes**:
+<!--
+*Automatically closes linked issue when PR is merged.
+Usage: `Fixes #<issue number>`, or `Fixes (paste link of issue)`.
+_If PR is about `failing-tests or flakes`, please post the related issues/tests in a comment and do not use `Fixes`_*
+-->
+Fixes #
+
+**Special notes for your reviewer**:

README.md

@@ -49,8 +49,7 @@ Additional files or resources can be added to the binary by passing `-r "glob/pa
 
 ## Compiling Node
 
-By default `nexe` will attempt to download a pre-built executable. However, It may be unavailable ([github releases](https://github.com/nexe/nexe/releases))
-or you may want to customize what is built. See `nexe --help` for a list of options available when passing the [`--build`](#build-boolean) option. You will also need to ensure your environment is setup to [build node](https://github.com/nodejs/node/blob/master/BUILDING.md). Note: the `python` binary in your path should be an acceptable version of python 2. eg. Systems that have python2 will need to create a [symlink](https://github.com/nexe/nexe/issues/354#issuecomment-319874486).
+By default `nexe` will attempt to download a pre-built executable. These are listed on the [Nexe V3 releases page](https://github.com/nexe/nexe/releases/tag/v3.3.3). The exact version you want may be unavailable or you may want to customize what is built. See `nexe --help` for a list of options available when passing the [`--build`](#build-boolean) option. You will also need to ensure your environment is setup to [build node](https://github.com/nodejs/node/blob/master/BUILDING.md). Note: the `python` binary in your path should be an acceptable version of python 2. eg. Systems that have python2 will need to create a [symlink](https://github.com/nexe/nexe/issues/354#issuecomment-319874486).
 
 ## Node.js API
 
@@ -117,8 +116,8 @@ compile({
     - default: true
  - #### `build: boolean`
     - Build node from source, passing this flag tells nexe to download and build from source. Subsequently using this flag will cause nexe to use the previously built binary. To rebuild, first add [`--clean`](#clean-boolean)
- - #### `asset: string`
-    - Provide a pre-built nexe binary asset, this can either be an http or https URL or a file path.
+ - #### `remote: string`
+    - Provide a custom remote location for fetching pre-built nexe binaries from. This can either be an HTTP or HTTPS URL or a file path.
     - default: `null`
  - #### `python: string`
     - On Linux this is the path pointing to your python2 executable
@@ -203,7 +202,7 @@ For examples, see the built in patches: [src/patches](src/patches).
     - Quickly perform a replace in a file within the downloaded Node.js source. The rest arguments are passed along to `String.prototype.replace`
  - `readFileAsync(filename: string): Promise<NexeFile>`
     - Access (or create) a file within the downloaded Node.js source.
- - `addResource(filename: string, contents: Buffer): void`
+ - `addResource(filename: string, contents: Buffer): Promise<void>`
     - Add a resource to the nexe bundle
  - `files: NexeFile[]`
     - The cache of the currently read, modified, or created files within the downloaded Node.js source.
@@ -217,9 +216,7 @@ Any modifications made to `NexeFile#contents` will be maintained in the cache _w
 
 ## Native Modules
 
-TODO
-
-- [ ] Implement support for `node-pre-gyp#find`.
+In order to use native modules, the native binaries must be shipped alongside the binary generated by nexe.
 
 ## Contributing
 
@@ -227,20 +224,10 @@ Building
 ```
 $ git clone git@github.com:nexe/nexe.git
 $ cd nexe
-$ yarn
+$ npm i && npm run build
 ```
 
 Testing
 ```
 $ npm test
 ```
-
-## Maintainers
-
-[![Jared Allard](https://avatars.githubusercontent.com/u/2391349?s=130)](https://jaredallard.me/) | [![Caleb Boyd](https://avatars.githubusercontent.com/u/5818726?s=130)](https://github.com/calebboyd) | [![Dustin Greif](https://avatars.githubusercontent.com/u/3026298?s=130)](https://github.com/dgreif) |
----|---|---|
-[Jared Allard](https://github.com/jaredallard) | [Caleb Boyd](http://github.com/calebboyd) |  [Dustin Greif](https://github.com/dgreif) |
-
-### Former
-
-- [Craig Condon](http://crcn.codes/)

azure-pipelines.yml

@@ -19,13 +19,13 @@ schedules:
       - master
 jobs:
 - job: BaseBuild
-  timeoutInMinutes: 180
+  timeoutInMinutes: 360
   strategy:
     matrix:
       linux:
         imageName: 'ubuntu-16.04'
       mac:
-        imageName: 'macos-10.13'
+        imageName: 'macos-10.15'
       windows_2017:
         imageName: 'vs2017-win2016'
       windows_2015:
@@ -43,18 +43,27 @@ jobs:
   - task: NodeTool@0
     displayName: Install Node
     inputs:
-      versionSpec: '10.x'
+      versionSpec: '12.x'
   - script: sudo apt-get update && sudo apt-get install -y libc6-dev-i386 gcc-multilib g++-multilib
     condition: contains(variables['Agent.JobName'], 'linux')
     displayName: Install Linux build dependencies
   - script: choco install visualcpp-build-tools --version 14.0.25420.1 -fy && npm config set msvs_version 2015
     condition: contains(variables['Agent.JobName'], 'windows_2015')
     displayName: Install Windows build dependencies
-  - script: choco install nasm -fy
-    displayName: Install Windows Assembler (NASM)
-    condition: contains(variables['Agent.JobName'], 'windows')
   - script: npm install && npm run ci:build
     displayName: Build Nexe
     env:
       GITHUB_TOKEN: $(PersonalGithubToken)
       NEXE_VERBOSE: $(NEXE_VERBOSE)
+      msbuild_args: /3G
+    condition: not(contains(variables['Agent.JobName'], 'windows'))
+  - powershell: |
+      iex (new-object net.webclient).downloadstring('https://get.scoop.sh')
+      scoop install nasm
+      npm install
+      npm run ci:build
+    displayName: Build Nexe (Windows)
+    condition: contains(variables['Agent.JobName'], 'windows')
+    env:
+      GITHUB_TOKEN: $(PersonalGithubToken)
+      NEXE_VERBOSE: $(NEXE_VERBOSE)

issue_template.md

@@ -1,19 +0,0 @@
-<!-- If you need help or think you have found a bug, please help us with your issue by entering the following information (otherwise you can delete this text): -->
-
-**Is this a BUG or a FEATURE REQUEST?:** 
-
-**What happened:**
-
-**What you expected to happen:**
-
-**How to reproduce it (as minimally and precisely as possible):**
-
-**Anything else we need to know?:**
-
-**Environment**
-
-- Platform(OS/Version):
-- Host Node Version:
-- Target Node Version:
-- Nexe version:
-- Python Version:

package.json

@@ -2,7 +2,7 @@
   "name": "nexe",
   "description": "Create a single executable out of your Node.js application",
   "license": "MIT",
-  "version": "3.3.3",
+  "version": "4.0.0-beta.14",
   "contributors": [
     "Craig Condon <craig.j.condon@gmail.com> (http://crcn.io)",
     "Jared Allard <jaredallard@outlook.com>",
@@ -30,47 +30,46 @@
     "nexe": "index.js"
   },
   "engines": {
-    "node": ">=6"
+    "node": ">=10"
   },
   "dependencies": {
     "@calebboyd/semaphore": "^1.3.1",
-    "app-builder": "^5.2.0",
+    "app-builder": "^6.2.2",
     "caw": "^2.0.1",
     "chalk": "^2.4.2",
     "cherow": "1.6.9",
     "download": "^7.1.0",
-    "globby": "^9.2.0",
+    "globby": "^11.0.1",
     "got": "^9.6.0",
-    "minimist": "^1.2.0",
-    "mkdirp": "^0.5.1",
-    "multistream": "^2.1.1",
+    "minimist": "^1.2.5",
+    "mkdirp": "^1.0.4",
+    "multistream": "^4.0.0",
     "ora": "^3.4.0",
     "pify": "^4.0.1",
-    "resolve-dependencies": "^2.2.3",
-    "rimraf": "^2.6.3"
+    "resolve-dependencies": "^6.0.2",
+    "rimraf": "^3.0.2"
   },
   "devDependencies": {
-    "@types/chai": "^4.1.7",
+    "@types/chai": "^4.2.11",
     "@types/download": "^6.2.4",
-    "@types/execa": "^0.9.0",
     "@types/globby": "^9.1.0",
-    "@types/got": "^9.6.0",
+    "@types/got": "^9.6.10",
     "@types/minimist": "^1.2.0",
-    "@types/mkdirp": "^0.5.2",
-    "@types/mocha": "^5.2.7",
+    "@types/mkdirp": "^1.0.0",
+    "@types/mocha": "^7.0.2",
     "@types/multistream": "^2.1.1",
     "@types/ora": "^3.2.0",
     "@types/pify": "3.0.2",
-    "@types/rimraf": "2.0.2",
-    "@types/semver": "^6.0.0",
+    "@types/rimraf": "3.0.0",
+    "@types/semver": "^7.1.0",
     "chai": "^4.2.0",
-    "execa": "^1.0.0",
-    "mocha": "^6.1.4",
-    "prettier": "^1.18.2",
-    "ts-node": "^8.3.0",
-    "tslint": "^5.17.0",
+    "execa": "^4.0.2",
+    "mocha": "^7.1.1",
+    "prettier": "^2.0.5",
+    "ts-node": "^8.9.0",
+    "tslint": "^6.1.1",
     "tslint-config-prettier": "^1.18.0",
-    "tslint-plugin-prettier": "^2.0.1",
-    "typescript": "^3.5.2"
+    "tslint-plugin-prettier": "^2.3.0",
+    "typescript": "^3.8.3"
   }
 }

src/compiler.ts

@@ -11,12 +11,14 @@ import {
   dequote,
   isWindows,
   bound,
-  semverGt
+  semverGt,
+  wrap,
 } from './util'
 import { NexeOptions, version } from './options'
 import { NexeTarget } from './target'
-import combineStreams = require('multistream')
+import MultiStream = require('multistream')
 import { Bundle, toStream } from './fs/bundle'
+import { File } from 'resolve-dependencies'
 
 const isBsd = Boolean(~process.platform.indexOf('bsd'))
 const make = isWindows ? 'vcbuild.bat' : isBsd ? 'gmake' : 'make'
@@ -27,7 +29,7 @@ type StringReplacer = (match: string) => string
 export interface NexeFile {
   filename: string
   absPath: string
-  contents: string
+  contents: string | Buffer
 }
 
 export { NexeOptions }
@@ -108,12 +110,18 @@ export class NexeCompiler {
     //SOMEDAY iterate over multiple targets with `--outDir`
     this.targets = options.targets as NexeTarget[]
     this.target = this.targets[0]
-    if (options.asset && options.asset.startsWith('http')) {
-      this.remoteAsset = options.asset
-    } else {
-      this.remoteAsset =
-        'https://github.com/nexe/nexe/releases/download/v3.3.3/' + this.target.toString()
+    if (
+      !(
+        options.remote.startsWith('http://') ||
+        options.remote.startsWith('https://') ||
+        options.remote.startsWith('file://')
+      )
+    ) {
+      throw new NexeError(
+        `Invalid remote URI scheme (must be http, https, or file): ${options.remote}`
+      )
     }
+    this.remoteAsset = options.remote + this.target.toString()
     this.src = join(this.options.temp, this.target.version)
     this.configureScript = configure + (semverGt(this.target.version, '10.10.0') ? '.py' : '')
     this.nodeSrcBinPath = isWindows
@@ -136,31 +144,23 @@ export class NexeCompiler {
   }
 
   @bound
-  addResource(file: string, content?: Buffer | string) {
-    return this.bundle.addResource(file, content)
-  }
-
-  get binaryConfiguration() {
-    return { resources: this.bundle.index }
-  }
-
-  get resourceSize() {
-    return this.bundle.blobSize
+  addResource(absoluteFileName: string, content?: Buffer | string | File) {
+    return this.bundle.addResource(absoluteFileName, content)
   }
 
   @bound
   async readFileAsync(file: string) {
     this.assertBuild()
-    let cachedFile = this.files.find(x => normalize(x.filename) === normalize(file))
+    let cachedFile = this.files.find((x) => normalize(x.filename) === normalize(file))
     if (!cachedFile) {
       const absPath = join(this.src, file)
       cachedFile = {
         absPath,
         filename: file,
-        contents: await readFileAsync(absPath, 'utf-8').catch(x => {
+        contents: await readFileAsync(absPath, 'utf-8').catch((x) => {
           if (x.code === 'ENOENT') return ''
           throw x
-        })
+        }),
       }
       this.files.push(cachedFile)
     }
@@ -176,11 +176,11 @@ export class NexeCompiler {
   @bound
   async replaceInFileAsync(file: string, replace: string | RegExp, value: string | StringReplacer) {
     const entry = await this.readFileAsync(file)
-    entry.contents = entry.contents.replace(replace, value as any)
+    entry.contents = entry.contents.toString().replace(replace, value as any)
   }
 
   @bound
-  async setFileContentsAsync(file: string, contents: string) {
+  async setFileContentsAsync(file: string, contents: string | Buffer) {
     const entry = await this.readFileAsync(file)
     entry.contents = contents
   }
@@ -198,9 +198,6 @@ export class NexeCompiler {
   }
 
   public getNodeExecutableLocation(target?: NexeTarget) {
-    if (this.options.asset && !this.options.asset.startsWith('http')) {
-      return resolve(this.options.cwd, this.options.asset)
-    }
     if (target) {
       return join(this.options.temp, target.toString())
     }
@@ -215,7 +212,7 @@ export class NexeCompiler {
       spawn(command, args, {
         cwd: this.src,
         env: this.env,
-        stdio: this.log.verbose ? 'inherit' : 'ignore'
+        stdio: this.log.verbose ? 'inherit' : 'ignore',
       })
         .once('error', (e: Error) => {
           if (this.log.verbose) {
@@ -242,7 +239,7 @@ export class NexeCompiler {
     }
     return this._runBuildCommandAsync(this.env.PYTHON || 'python', [
       this.configureScript,
-      ...this.options.configure
+      ...this.options.configure,
     ])
   }
 
@@ -261,10 +258,7 @@ export class NexeCompiler {
     return createReadStream(this.getNodeExecutableLocation())
   }
 
-  private async _shouldCompileBinaryAsync(
-    binary: NodeJS.ReadableStream | null,
-    location: string | undefined
-  ) {
+  private async _shouldCompileBinaryAsync(binary: NodeJS.ReadableStream | null, location: string) {
     //SOMEDAY combine make/configure/vcBuild/and modified times of included files
     const { snapshot, build } = this.options
 
@@ -298,22 +292,24 @@ export class NexeCompiler {
     return [this.shims.join(''), this.startup].join(';')
   }
 
-  private _assembleDeliverable(binary: NodeJS.ReadableStream) {
+  private async _assembleDeliverable(binary: NodeJS.ReadableStream) {
     if (!this.options.mangle) {
       return binary
     }
+    const resources = this.bundle.renderIndex()
+    this.shims.unshift(wrap(`process.__nexe = ${JSON.stringify({ resources })};\n`))
 
-    const startup = this.code(),
-      codeSize = Buffer.byteLength(startup)
+    const code = this.code(),
+      codeSize = Buffer.byteLength(code),
+      lengths = Buffer.from(Array(16))
 
-    const lengths = Buffer.from(Array(16))
     lengths.writeDoubleLE(codeSize, 0)
-    lengths.writeDoubleLE(this.bundle.blobSize, 8)
-    return combineStreams([
+    lengths.writeDoubleLE(this.bundle.size, 8)
+    return new (MultiStream as any)([
       binary,
-      toStream(startup),
+      toStream(code),
       this.bundle.toStream(),
-      toStream(Buffer.concat([Buffer.from('<nexe~~sentinel>'), lengths]))
+      toStream(Buffer.concat([Buffer.from('<nexe~~sentinel>'), lengths])),
     ])
   }
 }

src/fs/bundle.ts

@@ -1,70 +1,156 @@
-import { stat as getStat, Stats, createReadStream } from 'fs'
+import * as fs from 'fs'
+import { promisify } from 'util'
 import { relative } from 'path'
 import { Readable } from 'stream'
-import combineStreams = require('multistream')
+import { argv } from '../options'
+import { File } from 'resolve-dependencies'
+import MultiStream = require('multistream')
 
-const stat = (file: string): Promise<Stats> => {
-  return new Promise((resolve, reject) => {
-    getStat(file, (err, stats) => (err ? reject(err) : resolve(stats)))
-  })
-}
+const lstat = promisify(fs.lstat),
+  realpath = promisify(fs.realpath),
+  createReadStream = fs.createReadStream,
+  stat = promisify(fs.stat)
+
+export type MultiStreams = (Readable | (() => Readable))[]
 
 function makeRelative(cwd: string, path: string) {
   return './' + relative(cwd, path)
 }
 
+function sortEntry(a: [string, File], b: [string, File]) {
+  return a[0] > b[0] ? 1 : -1
+}
+
 export function toStream(content: Buffer | string) {
-  const readable = new Readable({ read() {} })
-  readable.push(content)
-  readable.push(null)
+  const readable = new Readable({
+    read() {
+      this.push(content)
+      this.push(null)
+    },
+  })
   return readable
 }
 
-export type File = { absPath: string; contents: string; deps: FileMap }
-export type FileMap = { [absPath: string]: File | null }
-
-export interface BundleOptions {
-  entries: string[]
-  cwd: string
-  expand: boolean
-  loadContent: boolean
-  files: FileMap
+async function createFile(absoluteFileName: string) {
+  const stats = await lstat(absoluteFileName),
+    file: File = {
+      size: stats.size,
+      contents: '',
+      absPath: absoluteFileName,
+      deps: {},
+    }
+  if (stats.isSymbolicLink()) {
+    file.size = stats.size
+    const [realPath, realStat] = await Promise.all([
+      realpath(absoluteFileName),
+      stat(absoluteFileName),
+    ])
+    file.realPath = realPath
+    file.realSize = realStat.size
+  }
+  return file
 }
 
 export class Bundle {
+  size = 0
+  cwd: string
+  rendered = false
+  private offset = 0
+  private index: { [key: string]: [number, number] } = {}
+  private files: { [key: string]: File } = {}
+  streams: MultiStreams = []
   constructor({ cwd }: { cwd: string } = { cwd: process.cwd() }) {
     this.cwd = cwd
   }
-  cwd: string
-  blobSize: number = 0
-  index: { [relativeFilePath: string]: [number, number] } = {}
-  streams: (Readable | (() => Readable))[] = []
 
-  async addResource(absoluteFileName: string, content?: Buffer | string) {
-    let length = 0
-    if (content !== undefined) {
-      length = Buffer.byteLength(content)
-    } else {
-      const stats = await stat(absoluteFileName)
-      length = stats.size
-    }
-
-    const start = this.blobSize
-
-    this.blobSize += length
-    this.index[makeRelative(this.cwd, absoluteFileName)] = [start, length]
-    this.streams.push(() => (content ? toStream(content) : createReadStream(absoluteFileName)))
+  get list() {
+    return Object.keys(this.files)
   }
 
-  concat() {
-    throw new Error('Not Implemented')
+  public async addResource(
+    absoluteFileName: string,
+    content?: File | Buffer | string
+  ): Promise<number> {
+    if (this.files[absoluteFileName]) {
+      return this.size
+    }
+    if (typeof content === 'string' || Buffer.isBuffer(content)) {
+      this.files[absoluteFileName] = {
+        size: Buffer.byteLength(content),
+        contents: content as any, //todo type is wrong here... should allow buffer
+        deps: {},
+        absPath: absoluteFileName,
+      }
+    } else if (content) {
+      this.files[content.absPath] = content
+    } else {
+      this.files[absoluteFileName] = {
+        absPath: absoluteFileName,
+        contents: '',
+        deps: {},
+        size: 0,
+      }
+      this.files[absoluteFileName] = await createFile(absoluteFileName)
+    }
+    return (this.size += this.files[absoluteFileName].size)
+  }
+
+  /**
+   * De-dupe files by absolute path, partition by symlink/real
+   * Iterate over real, add entries
+   * Iterate over symlinks, add symlinks
+   */
+  renderIndex() {
+    if (this.rendered) {
+      throw new Error('Bundle index already rendered')
+    }
+    const files = Object.entries(this.files),
+      realFiles: [string, File][] = [],
+      symLinks: [string, File][] = []
+    for (const entry of files) {
+      if (entry[1].realPath) {
+        symLinks.push(entry)
+      } else {
+        realFiles.push(entry)
+      }
+    }
+    realFiles.sort(sortEntry)
+    symLinks.sort(sortEntry)
+
+    for (const [absPath, file] of realFiles) {
+      this.addEntry(absPath, file)
+    }
+    for (const [absPath, file] of symLinks) {
+      this.addEntry(file.realPath as string, file)
+      this.addEntry(absPath, file, file.realPath)
+    }
+    this.rendered = true
+    return this.index
+  }
+
+  /**
+   * Add a stream if needed and an entry with the required offset and size
+   * Ensure the calling order of this method is idempotent (eg, while iterating a sorted set)
+   * @param entryPath
+   * @param file
+   * @param useEntry
+   */
+  addEntry(entryPath: string, file: File, useEntry?: string) {
+    const existingName = useEntry && makeRelative(this.cwd, useEntry),
+      name = makeRelative(this.cwd, entryPath),
+      size = file.realSize ?? file.size,
+      existingEntry = this.index[existingName ?? name]
+
+    this.index[name] = existingEntry || [this.offset, size]
+    if (!existingEntry) {
+      this.streams.push(() =>
+        file.contents ? toStream(file.contents) : createReadStream(file.absPath)
+      )
+      this.offset += size
+    }
   }
 
   toStream() {
-    return combineStreams(this.streams)
-  }
-
-  toJSON() {
-    return this.index
+    return new (MultiStream as any)(this.streams)
   }
 }

src/fs/patch.ts

@@ -15,6 +15,12 @@ export interface NexeBinary {
 let originalFsMethods: any = null
 let lazyRestoreFs = () => {}
 
+// optional Win32 file namespace prefix followed by drive letter and colon
+const windowsFullPathRegex = /^(\\{2}\?\\)?([a-zA-Z]):/
+
+const upcaseDriveLetter = (s: string): string =>
+  s.replace(windowsFullPathRegex, (_match, ns, drive) => `${ns || ''}${drive.toUpperCase()}:`)
+
 function shimFs(binary: NexeBinary, fs: any = require('fs')) {
   if (originalFsMethods !== null) {
     return
@@ -28,18 +34,21 @@ function shimFs(binary: NexeBinary, fs: any = require('fs')) {
     isString = (x: any): x is string => typeof x === 'string' || x instanceof String,
     noop = () => {},
     path = require('path'),
-    baseDir = path.dirname(process.execPath)
+    winPath: (key: string) => string = isWin ? upcaseDriveLetter : (s) => s,
+    baseDir = winPath(path.dirname(process.execPath))
 
   let log = (_: string) => true
+  let loggedManifest = false
   if ((process.env.DEBUG || '').toLowerCase().includes('nexe:require')) {
-    log = (text: string) => process.stderr.write('[nexe] - ' + text + '\n')
-  }
-
-  const winPath = (key: string) => {
-    if (isWin && key.substr(1, 2) === ':\\') {
-      key = key[0].toUpperCase() + key.substr(1)
+    log = (text: string) => {
+      setupManifest()
+      if (!loggedManifest) {
+        process.stderr.write('[nexe] - MANIFEST' + JSON.stringify(manifest, null, 4) + '\n')
+        process.stderr.write('[nexe] - DIRECTORIES' + JSON.stringify(directories, null, 4) + '\n')
+        loggedManifest = true
+      }
+      return process.stderr.write('[nexe] - ' + text + '\n')
     }
-    return key
   }
 
   const getKey = function getKey(filepath: string | Buffer | null): string {
@@ -54,7 +63,7 @@ function shimFs(binary: NexeBinary, fs: any = require('fs')) {
     return winPath(key)
   }
 
-  const statTime = function() {
+  const statTime = function () {
     return {
       dev: 0,
       ino: 0,
@@ -71,25 +80,38 @@ function shimFs(binary: NexeBinary, fs: any = require('fs')) {
       ctime: new Date(stat.ctime),
       ctimMs: stat.ctime.getTime(),
       birthtime: new Date(stat.birthtime),
-      birthtimeMs: stat.birthtime.getTime()
+      birthtimeMs: stat.birthtime.getTime(),
     }
   }
 
-  const createStat = function(extensions: any) {
-    return Object.assign(new fs.Stats(), binary.layout.stat, statTime(), extensions)
+  let BigInt: Function
+  try {
+    BigInt = eval('BigInt')
+  } catch (ignored) {}
+
+  const createStat = function (extensions: any, options: any) {
+    const stat = Object.assign(new fs.Stats(), binary.layout.stat, statTime(), extensions)
+    if (options && options.bigint && BigInt) {
+      for (const k in stat) {
+        if (Object.prototype.hasOwnProperty.call(stat, k) && typeof stat[k] === 'number') {
+          stat[k] = BigInt(stat[k])
+        }
+      }
+    }
+    return stat
   }
 
-  const ownStat = function(filepath: any) {
+  const ownStat = function (filepath: any, options: any) {
     setupManifest()
     const key = getKey(filepath)
     if (directories[key]) {
       let mode = binary.layout.stat.mode
       mode |= fs.constants.S_IFDIR
       mode &= ~fs.constants.S_IFREG
-      return createStat({ mode, size: 0 })
+      return createStat({ mode, size: 0 }, options)
     }
     if (manifest[key]) {
-      return createStat({ size: manifest[key][1] })
+      return createStat({ size: manifest[key][1] }, options)
     }
   }
 
@@ -102,7 +124,7 @@ function shimFs(binary: NexeBinary, fs: any = require('fs')) {
   }
 
   let setupManifest = () => {
-    Object.keys(manifest).forEach(filepath => {
+    Object.keys(manifest).forEach((filepath) => {
       const entry = manifest[filepath]
       const absolutePath = getKey(filepath)
       const longPath = makeLong(absolutePath)
@@ -196,19 +218,19 @@ function shimFs(binary: NexeBinary, fs: any = require('fs')) {
       const encoding = fileOpts(options).encoding
       callback = typeof options === 'function' ? options : callback
 
-      originalFsMethods.open(blobPath, 'r', function(err: Error, fd: number) {
+      originalFsMethods.open(blobPath, 'r', function (err: Error, fd: number) {
         if (err) return callback(err, null)
-        originalFsMethods.read(fd, Buffer.alloc(length), 0, length, resourceOffset, function(
+        originalFsMethods.read(fd, Buffer.alloc(length), 0, length, resourceOffset, function (
           error: Error,
           bytesRead: number,
           result: Buffer
         ) {
           if (error) {
-            return originalFsMethods.close(fd, function() {
+            return originalFsMethods.close(fd, function () {
               callback(error, null)
             })
           }
-          originalFsMethods.close(fd, function(err: Error) {
+          originalFsMethods.close(fd, function (err: Error) {
             if (err) {
               return callback(err, result)
             }
@@ -231,7 +253,7 @@ function shimFs(binary: NexeBinary, fs: any = require('fs')) {
         blobPath,
         Object.assign({}, opts, {
           start: resourceOffset,
-          end: resourceOffset + length - 1
+          end: resourceOffset + length - 1,
         })
       )
     },
@@ -250,15 +272,21 @@ function shimFs(binary: NexeBinary, fs: any = require('fs')) {
       originalFsMethods.closeSync(fd)
       return encoding ? result.toString(encoding) : result
     },
-    statSync: function statSync(filepath: string | Buffer) {
-      const stat = ownStat(filepath)
+    statSync: function statSync(filepath: string | Buffer, options: any) {
+      const stat = ownStat(filepath, options)
       if (stat) {
         return stat
       }
       return originalFsMethods.statSync.apply(fs, arguments)
     },
-    stat: function stat(filepath: string | Buffer, callback: any) {
-      const stat = ownStat(filepath)
+    stat: function stat(filepath: string | Buffer, options: any, callback: any) {
+      let stat: any
+      if (typeof options === 'function') {
+        callback = options
+        stat = ownStat(filepath, null)
+      } else {
+        stat = ownStat(filepath, options)
+      }
       if (stat) {
         process.nextTick(() => {
           callback(null, stat)
@@ -266,11 +294,11 @@ function shimFs(binary: NexeBinary, fs: any = require('fs')) {
       } else {
         return originalFsMethods.stat.apply(fs, arguments)
       }
-    }
+    },
   }
 
   if (typeof fs.exists === 'function') {
-    nfs.exists = function(filepath: string, cb: Function) {
+    nfs.exists = function (filepath: string, cb: Function) {
       cb = cb || noop
       const exists = nfs.existsSync(filepath)
       process.nextTick(() => cb(exists))
@@ -279,9 +307,9 @@ function shimFs(binary: NexeBinary, fs: any = require('fs')) {
 
   const patches = (process as any).nexe.patches || {}
   delete (process as any).nexe
-  patches.internalModuleReadFile = function(this: any, original: any, ...args: any[]) {
-    const [filepath] = args
+  patches.internalModuleReadFile = function (this: any, original: any, ...args: any[]) {
     setupManifest()
+    const filepath = getKey(args[0])
     if (manifest[filepath]) {
       log('read     (hit)              ' + filepath)
       return nfs.readFileSync(filepath, 'utf-8')
@@ -290,9 +318,9 @@ function shimFs(binary: NexeBinary, fs: any = require('fs')) {
     return original.call(this, ...args)
   }
   patches.internalModuleReadJSON = patches.internalModuleReadFile
-  patches.internalModuleStat = function(this: any, original: any, ...args: any[]) {
+  patches.internalModuleStat = function (this: any, original: any, ...args: any[]) {
     setupManifest()
-    const [filepath] = args
+    const filepath = getKey(args[0])
     if (manifest[filepath]) {
       log('stat     (hit)              ' + filepath + '   ' + 0)
       return 0
@@ -313,7 +341,7 @@ function shimFs(binary: NexeBinary, fs: any = require('fs')) {
   }
 
   if (typeof fs.exists === 'function') {
-    nfs.exists = function(filepath: string, cb: Function) {
+    nfs.exists = function (filepath: string, cb: Function) {
       cb = cb || noop
       const exists = nfs.existsSync(filepath)
       if (!exists) {
@@ -324,7 +352,7 @@ function shimFs(binary: NexeBinary, fs: any = require('fs')) {
   }
 
   if (typeof fs.copyFile === 'function') {
-    nfs.copyFile = function(filepath: string, dest: string, flags: number, callback: Function) {
+    nfs.copyFile = function (filepath: string, dest: string, flags: number, callback: Function) {
       setupManifest()
       const entry = manifest[getKey(filepath)]
       if (!entry) {
@@ -346,7 +374,7 @@ function shimFs(binary: NexeBinary, fs: any = require('fs')) {
         })
       })
     }
-    nfs.copyFileSync = function(filepath: string, dest: string) {
+    nfs.copyFileSync = function (filepath: string, dest: string) {
       setupManifest()
       const entry = manifest[getKey(filepath)]
       if (!entry) {
@@ -359,7 +387,7 @@ function shimFs(binary: NexeBinary, fs: any = require('fs')) {
   Object.assign(fs, nfs)
 
   lazyRestoreFs = () => {
-    Object.keys(nfs).forEach(key => {
+    Object.keys(nfs).forEach((key) => {
       fs[key] = originalFsMethods[key]
     })
     lazyRestoreFs = () => {}

src/logger.ts

@@ -24,7 +24,7 @@ export class Logger {
       this.ora = ora({
         text: 'Starting...',
         color: 'blue',
-        spinner: 'dots'
+        spinner: 'dots',
       })
       this.ora.stop()
     }
@@ -35,7 +35,7 @@ export class Logger {
 
   flush() {
     !this.silent && this.ora.succeed()
-    return new Promise(resolve => setTimeout(resolve, frameLength))
+    return new Promise((resolve) => setTimeout(resolve, frameLength))
   }
 
   _write(update: string, color = 'green') {
@@ -66,7 +66,7 @@ export class Logger {
       modify: this.modify,
       log: this.verbose ? this.write : this.modify,
       pause: () => this.ora.stopAndPersist(),
-      resume: () => this.ora.start()
+      resume: () => this.ora.start(),
     } as LogStep
   }
 }

src/options.ts

@@ -5,7 +5,7 @@ import { basename, extname, join, isAbsolute, resolve } from 'path'
 import { getTarget, NexeTarget } from './target'
 import { EOL, homedir } from 'os'
 import chalk from 'chalk'
-import { resolveFileNameSync } from 'resolve-dependencies'
+import { resolveSync } from 'resolve-dependencies'
 const caw = require('caw')
 const c = process.platform === 'win32' ? chalk.constructor({ enabled: false }) : chalk
 
@@ -21,7 +21,7 @@ export interface NexeOptions {
   output: string
   targets: (string | NexeTarget)[]
   name: string
-  asset: string
+  remote: string
   cwd: string
   fs: boolean | string[]
   flags: string[]
@@ -70,7 +70,8 @@ const defaults = {
   build: false,
   bundle: true,
   patches: [],
-  plugins: []
+  plugins: [],
+  remote: 'https://github.com/nexe/nexe/releases/download/v3.3.3/',
 }
 const alias = {
   i: 'input',
@@ -80,7 +81,6 @@ const alias = {
   b: 'build',
   n: 'name',
   r: 'resource',
-  a: 'asset',
   p: 'python',
   f: 'flag',
   c: 'configure',
@@ -88,7 +88,7 @@ const alias = {
   h: 'help',
   l: 'loglevel',
   'fake-argv': 'fakeArgv',
-  'gh-token': 'ghToken'
+  'gh-token': 'ghToken',
 }
 const argv = parseArgv(process.argv, { alias, default: { ...defaults } })
 let help = `
@@ -101,7 +101,7 @@ ${c.bold('nexe <entry-file> [options]')}
   -t   --target                     -- node version description
   -n   --name                       -- main app module name
   -r   --resource                   -- *embed files (glob) within the binary
-  -a   --asset                      -- alternate asset path, file or url pointing to a base (nexe) binary
+       --remote                     -- alternate location (URL) to download pre-built base (nexe) binaries from
        --plugin                     -- extend nexe runtime behavior
 
    ${c.underline.bold('Building from source:')}
@@ -112,7 +112,7 @@ ${c.bold('nexe <entry-file> [options]')}
   -c   --configure                  -- *arguments to the configure step
   -m   --make                       -- *arguments to the make/build step
        --patch                      -- module with middleware default export for adding a build patch
-       --no-mangle                  -- used when generating base binaries, or when patching _third_party_main manually.
+       --no-mangle                  -- used when generating base binaries, or when patching _third_party_main manually
        --snapshot                   -- path to a warmup snapshot
        --ico                        -- file name for alternate icon file (windows)
        --rc-*                       -- populate rc file options (windows)
@@ -133,7 +133,7 @@ ${c.bold('nexe <entry-file> [options]')}
 help = EOL + help + EOL
 
 function flatten(...args: any[]): string[] {
-  return ([] as string[]).concat(...args).filter(x => x)
+  return ([] as string[]).concat(...args).filter((x) => x)
 }
 
 /**
@@ -144,16 +144,13 @@ function flatten(...args: any[]): string[] {
  */
 function extractCliMap(match: RegExp, options: any) {
   return Object.keys(options)
-    .filter(x => match.test(x))
-    .reduce(
-      (map: any, option: any) => {
-        const key = option.split('-')[1]
-        map[key] = options[option]
-        delete options[option]
-        return map
-      },
-      {} as any
-    )
+    .filter((x) => match.test(x))
+    .reduce((map: any, option: any) => {
+      const key = option.split('-')[1]
+      map[key] = options[option]
+      delete options[option]
+      return map
+    }, {} as any)
 }
 
 function extractLogLevel(options: NexeOptions) {
@@ -208,17 +205,17 @@ export function resolveEntry(
   }
   if (input) {
     const inputPath = padRelative(input)
-    result = resolveFileNameSync(cwd, inputPath)
+    result = resolveSync(cwd, inputPath)
   }
   if (isEntryFile(maybeEntry) && (!result || !result.absPath)) {
     const inputPath = padRelative(maybeEntry)
-    result = resolveFileNameSync(cwd, inputPath)
+    result = resolveSync(cwd, inputPath)
   }
   if (!process.stdin.isTTY && (!result || !result.absPath) && bundle === defaults.bundle) {
     return STDIN_FLAG
   }
   if (!result || !result.absPath) {
-    result = resolveFileNameSync(cwd, '.')
+    result = resolveSync(cwd, '.')
   }
   if (!result.absPath) {
     throw new NexeError(`Entry file "${input || ''}" not found!`)
@@ -252,6 +249,10 @@ function normalizeOptions(input?: Partial<NexeOptions>): NexeOptions {
   options.configure = flatten(options.configure)
   options.resources = flatten(opts.resource, options.resources)
 
+  if (!options.remote.endsWith('/')) {
+    options.remote += '/'
+  }
+
   options.downloadOptions = options.downloadOptions || {}
   options.downloadOptions.headers = options.downloadOptions.headers || {}
   options.downloadOptions.headers['User-Agent'] = 'nexe (https://www.npmjs.com/package/nexe)'
@@ -292,8 +293,8 @@ function normalizeOptions(input?: Partial<NexeOptions>): NexeOptions {
   }
 
   Object.keys(alias)
-    .filter(k => k !== 'rc')
-    .forEach(x => delete opts[x])
+    .filter((k) => k !== 'rc')
+    .forEach((x) => delete opts[x])
 
   return options
 }

src/patches/boot-nexe.ts

@@ -20,13 +20,13 @@ const footer = tailWindow.slice(footerPosition, footerPosition + 32),
 Object.defineProperty(
   process,
   '__nexe',
-  (function() {
+  (function () {
     let nexeHeader: any = null
     return {
-      get: function() {
+      get: function () {
         return nexeHeader
       },
-      set: function(value: any) {
+      set: function (value: any) {
         if (nexeHeader) {
           throw new Error('This property is readonly')
         }
@@ -37,13 +37,13 @@ Object.defineProperty(
             contentSize,
             contentStart,
             resourceSize,
-            resourceStart
-          }
+            resourceStart,
+          },
         })
         Object.freeze(nexeHeader)
       },
       enumerable: false,
-      configurable: false
+      configurable: false,
     }
   })()
 )

src/patches/disable-node-cli.ts

@@ -9,11 +9,11 @@ export default async function disableNodeCli(compiler: NexeCompiler, next: () =>
   if (semverGt(compiler.target.version, '11.6.0')) {
     await compiler.replaceInFileAsync(
       'src/node.cc',
-      /(?<!int )ProcessGlobalArgs\(/g,
-      '0;//ProcessGlobalArgs('
+      /(?<!int )ProcessGlobalArgs\(argv[^;]*;/gm,
+      '0;/*$&*/'
     )
   } else if (semverGt(compiler.target.version, '10.9')) {
-    await compiler.replaceInFileAsync('src/node.cc', /(?<!void )ProcessArgv\(/g, '//ProcessArgv(')
+    await compiler.replaceInFileAsync('src/node.cc', /(?<!void )ProcessArgv\(argv/g, '//$&')
   } else if (semverGt(compiler.target.version, '9.999')) {
     await compiler.replaceInFileAsync(
       'src/node.cc',
@@ -21,7 +21,7 @@ export default async function disableNodeCli(compiler: NexeCompiler, next: () =>
       'int i = v8_argc; i < v8_argc; i++'
     )
     let matches = 0
-    await compiler.replaceInFileAsync('src/node.cc', /v8_argc > 1/g, match => {
+    await compiler.replaceInFileAsync('src/node.cc', /v8_argc > 1/g, (match) => {
       if (matches++) {
         return 'false'
       }

src/patches/gyp.ts

@@ -13,8 +13,8 @@ export default async function nodeGyp(
     `
     ${nodeGypMarker}
     ${files
-      .filter(x => x.filename.startsWith('lib'))
-      .map(x => `'${x.filename}'`)
+      .filter((x) => x.filename.startsWith('lib'))
+      .map((x) => `'${x.filename}'`)
       .toString()},
   `.trim()
   )

src/patches/node-rc.ts

@@ -8,18 +8,19 @@ export default async function nodeRc(compiler: NexeCompiler, next: () => Promise
 
   const file = await compiler.readFileAsync('src/res/node.rc')
 
-  Object.keys(options).forEach(key => {
+  Object.keys(options).forEach((key) => {
     let value = options[key]
     const isVar = /^[A-Z_]+$/.test(value)
     value = isVar ? value : `"${value}"`
-    file.contents = file.contents.replace(
-      new RegExp(`VALUE "${key}",.*`),
-      `VALUE "${key}", ${value}`
-    )
+    file.contents = file.contents
+      .toString()
+      .replace(new RegExp(`VALUE "${key}",.*`), `VALUE "${key}", ${value}`)
   })
-  ;['PRODUCTVERSION', 'FILEVERSION'].forEach(x => {
+  ;['PRODUCTVERSION', 'FILEVERSION'].forEach((x) => {
     if (options[x]) {
-      file.contents = file.contents.replace(new RegExp(x + ' .*$', 'm'), `${x} ${options[x]}`)
+      file.contents = file.contents
+        .toString()
+        .replace(new RegExp(x + ' .*$', 'm'), `${x} ${options[x]}`)
     }
   })
 

src/patches/snapshot.ts

@@ -2,7 +2,7 @@ import { resolve } from 'path'
 import { NexeCompiler } from '../compiler'
 import { semverGt } from '../util'
 
-export default async function(compiler: NexeCompiler, next: () => Promise<void>) {
+export default async function (compiler: NexeCompiler, next: () => Promise<void>) {
   const { snapshot, warmup, cwd } = compiler.options
 
   if (!snapshot) {

src/patches/third-party-main.ts

@@ -36,13 +36,13 @@ export default async function main(compiler: NexeCompiler, next: () => Promise<v
   }
 
   const file = await compiler.readFileAsync(bootFile),
-    ast = parse(file.contents, {
+    ast = parse(file.contents.toString(), {
       loc: true,
       tolerant: true,
       next: true,
       globalReturn: true,
       node: true,
-      skipShebang: true
+      skipShebang: true,
     }),
     location = { start: { line: 0 } }
 
@@ -54,7 +54,7 @@ export default async function main(compiler: NexeCompiler, next: () => Promise<v
     }
   })
 
-  const fileLines = file.contents.split('\n')
+  const fileLines = file.contents.toString().split('\n')
   fileLines.splice(
     location.start.line,
     0,
@@ -65,10 +65,23 @@ export default async function main(compiler: NexeCompiler, next: () => Promise<v
   file.contents = fileLines.join('\n')
 
   if (semverGt(version, '11.99')) {
+    if (semverGt(version, '12.17.99')) {
+      await compiler.replaceInFileAsync(
+        bootFile,
+        'initializeFrozenIntrinsics();',
+        'initializeFrozenIntrinsics();\n' + wrap('{{replace:lib/patches/boot-nexe.js}}')
+      )
+    } else {
+      await compiler.replaceInFileAsync(
+        bootFile,
+        'initializePolicy();',
+        'initializePolicy();\n' + wrap('{{replace:lib/patches/boot-nexe.js}}')
+      )
+    }
     await compiler.replaceInFileAsync(
       bootFile,
-      'initializePolicy();',
-      'initializePolicy();\n' + wrap('{{replace:lib/patches/boot-nexe.js}}')
+      'assert(!CJSLoader.hasLoadedAnyUserCJSModule)',
+      '/*assert(!CJSLoader.hasLoadedAnyUserCJSModule)*/'
     )
     await compiler.replaceInFileAsync(
       'src/node.cc',

src/releases.ts

@@ -2,7 +2,7 @@ import got = require('got')
 import { platforms, architectures, NexeTarget, getTarget, targetsEqual } from './target'
 export { NexeTarget }
 
-const versionsToSkip = [0, 1, 2, 3, 4, 5, 7, 9, 11]
+const versionsToSkip = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 11, 13, 15, 17, 19, 21, 22]
 export interface GitAsset {
   name: string
   url: string
@@ -25,19 +25,21 @@ async function getJson<T>(url: string, options?: any) {
 }
 
 function isBuildableVersion(version: string) {
-  const major = Number(version.split('.')[0])
-  return !versionsToSkip.includes(major) || version === '4.8.4'
+  if (version === '12.11.0') {
+    return false
+  }
+  return !versionsToSkip.includes(Number(version.split('.')[0]))
 }
 
-export function getV3GitRelease(options?: any) {
-  return getJson<GitRelease>('https://api.github.com/repos/nexe/nexe/releases/7567580/', options)
+export function getLatestGitRelease(options?: any) {
+  return getJson<GitRelease>('https://api.github.com/repos/nexe/nexe/releases/latest', options)
 }
 
 export async function getUnBuiltReleases(options?: any) {
   const nodeReleases = await getJson<NodeRelease[]>(
     'https://nodejs.org/download/release/index.json'
   )
-  const existingVersions = (await getV3GitRelease(options)).assets.map(x => getTarget(x.name))
+  const existingVersions = (await getLatestGitRelease(options)).assets.map((x) => getTarget(x.name))
 
   const versionMap: { [key: string]: true } = {}
   return nodeReleases
@@ -47,8 +49,8 @@ export async function getUnBuiltReleases(options?: any) {
         return versions
       }
       versionMap[version] = true
-      platforms.forEach(platform => {
-        architectures.forEach(arch => {
+      platforms.forEach((platform) => {
+        architectures.forEach((arch) => {
           if (arch === 'x86' && platform === 'mac') return
           if (arch.includes('arm')) return
           versions.push(getTarget({ platform, arch, version }))
@@ -56,5 +58,5 @@ export async function getUnBuiltReleases(options?: any) {
       })
       return versions
     }, [])
-    .filter(x => !existingVersions.some(t => targetsEqual(t, x)))
+    .filter((x) => !existingVersions.some((t) => targetsEqual(t, x)))
 }

src/steps/artifacts.ts

@@ -1,29 +1,28 @@
 import { join, dirname } from 'path'
-import { readdir, unlink } from 'fs'
+import * as fs from 'fs'
+import { promisify } from 'util'
 import { readFileAsync, writeFileAsync, isDirectoryAsync } from '../util'
-import * as mkdirp from 'mkdirp'
+import mkdirpAsync = require('mkdirp')
 import { NexeCompiler } from '../compiler'
-import pify = require('pify')
 
-const mkdirpAsync = pify(mkdirp)
-const unlinkAsync = pify(unlink)
-const readdirAsync = pify(readdir)
+const unlinkAsync = promisify(fs.unlink),
+  readdirAsync = promisify(fs.readdir)
 
 function readDirAsync(dir: string): Promise<string[]> {
-  return readdirAsync(dir).then(paths => {
+  return readdirAsync(dir).then((paths) => {
     return Promise.all(
       paths.map((file: string) => {
         const path = join(dir, file)
-        return isDirectoryAsync(path).then(x => (x ? readDirAsync(path) : (path as any)))
+        return isDirectoryAsync(path).then((x) => (x ? readDirAsync(path) : (path as any)))
       })
-    ).then(result => {
+    ).then((result) => {
       return [].concat(...(result as any))
     })
   })
 }
 
 function maybeReadFileContentsAsync(file: string) {
-  return readFileAsync(file, 'utf-8').catch(e => {
+  return readFileAsync(file, 'utf-8').catch((e) => {
     if (e.code === 'ENOENT') {
       return ''
     }
@@ -47,16 +46,16 @@ export default async function artifacts(compiler: NexeCompiler, next: () => Prom
   const tmpFiles = await readDirAsync(temp)
 
   await Promise.all(
-    tmpFiles.map(async path => {
+    tmpFiles.map(async (path) => {
       return compiler.writeFileAsync(path.replace(temp, ''), await readFileAsync(path, 'utf-8'))
     })
   )
 
   await next()
 
-  await Promise.all(tmpFiles.map(x => unlinkAsync(x)))
+  await Promise.all(tmpFiles.map((x) => unlinkAsync(x)))
   return Promise.all(
-    compiler.files.map(async file => {
+    compiler.files.map(async (file) => {
       const sourceFile = join(src, file.filename)
       const tempFile = join(temp, file.filename)
       const fileContents = await maybeReadFileContentsAsync(sourceFile)

src/steps/bundle.ts

@@ -1,13 +1,12 @@
 import { NexeCompiler, NexeError } from '../compiler'
 import { resolve, relative } from 'path'
-import { each } from '@calebboyd/semaphore'
-import resolveFiles, { resolveFileNameSync } from 'resolve-dependencies'
-import { dequote, STDIN_FLAG, semverGt } from '../util'
+import resolveFiles, { resolveSync } from 'resolve-dependencies'
+import { dequote, STDIN_FLAG, semverGt, each } from '../util'
 import { Readable } from 'stream'
 
 function getStdIn(stdin: Readable): Promise<string> {
   let out = ''
-  return new Promise(resolve => {
+  return new Promise((resolve) => {
     stdin
       .setEncoding('utf8')
       .on('readable', () => {
@@ -26,7 +25,7 @@ function getStdIn(stdin: Readable): Promise<string> {
 }
 
 export default async function bundle(compiler: NexeCompiler, next: any) {
-  const { bundle, cwd, input: inputPath } = compiler.options
+  const { bundle: doBundle, cwd, input: inputPath } = compiler.options
   let input = inputPath
   compiler.entrypoint = './' + relative(cwd, input)
 
@@ -36,14 +35,14 @@ export default async function bundle(compiler: NexeCompiler, next: any) {
     compiler.startup = ';require("module").runMain();'
   }
 
-  if (!bundle) {
+  if (!doBundle) {
     await compiler.addResource(resolve(cwd, input))
     return next()
   }
 
   let code = ''
-  if (typeof bundle === 'string') {
-    code = await require(bundle).createBundle(compiler.options)
+  if (typeof doBundle === 'string') {
+    code = await require(doBundle).createBundle(compiler.options)
   }
 
   if (input === STDIN_FLAG && (code = code || dequote(await getStdIn(process.stdin)))) {
@@ -54,7 +53,7 @@ export default async function bundle(compiler: NexeCompiler, next: any) {
   }
 
   if (input === STDIN_FLAG) {
-    const maybeInput = resolveFileNameSync(cwd, '.')
+    const maybeInput = resolveSync(cwd, '.')
     if (!maybeInput || !maybeInput.absPath) {
       throw new NexeError('No valid input detected')
     }
@@ -62,20 +61,25 @@ export default async function bundle(compiler: NexeCompiler, next: any) {
     compiler.entrypoint = './' + relative(cwd, input)
   }
 
-  const { files, warnings } = await resolveFiles(
+  const { files, warnings } = resolveFiles(
     input,
-    ...Object.keys(compiler.bundle.index).filter(x => x.endsWith('.js')),
-    { cwd, expand: true, loadContent: false }
+    ...Object.keys(compiler.bundle.list).filter((x) => x.endsWith('.js')),
+    { cwd, expand: 'variable', loadContent: false }
   )
 
   if (
-    warnings.filter(x => x.startsWith('Error parsing file') && !x.includes('node_modules')).length
+    warnings.filter((x) => x.startsWith('Error parsing file') && !x.includes('node_modules')).length
   ) {
     throw new NexeError('Parsing Error:\n' + warnings.join('\n'))
   }
 
-  await each(Object.keys(files), (filename: string) => compiler.addResource(filename), {
-    concurrency: 10
-  })
+  //TODO: warnings.forEach((x) => console.log(x))
+
+  await Promise.all(
+    Object.entries(files).map(([key, file]) => {
+      return compiler.addResource(key, file)
+    })
+  )
+
   return next()
 }

src/steps/download.ts

@@ -11,7 +11,7 @@ function fetchNodeSourceAsync(dest: string, url: string, step: LogStep, options
     .on('response', (res: IncomingMessage) => {
       const total = +res.headers['content-length']!
       let current = 0
-      res.on('data', data => {
+      res.on('data', (data) => {
         current += data.length
         setText((current / total) * 100)
         if (current === total) {
@@ -32,7 +32,7 @@ async function fetchPrebuiltBinary(compiler: NexeCompiler, step: any) {
       (res: IncomingMessage) => {
         const total = +res.headers['content-length']!
         let current = 0
-        res.on('data', data => {
+        res.on('data', (data) => {
           current += data.length
           step!.modify(`Downloading...${((current / total) * 100).toFixed()}%`)
         })

src/steps/resource.ts

@@ -1,22 +1,24 @@
-import { isDirectoryAsync, each } from '../util'
-import globs from 'globby'
+import { each } from '../util'
+import * as globs from 'globby'
 import { NexeCompiler } from '../compiler'
 
 export default async function resource(compiler: NexeCompiler, next: () => Promise<any>) {
-  const { cwd } = compiler.options
-  if (!compiler.options.resources.length) {
+  const { cwd, resources } = compiler.options
+  if (!resources.length) {
     return next()
   }
   const step = compiler.log.step('Bundling Resources...')
   let count = 0
-  await each(globs(compiler.options.resources, { cwd }), async file => {
-    if (await isDirectoryAsync(file)) {
-      return
-    }
+
+  // workaround for https://github.com/sindresorhus/globby/issues/127
+  // and https://github.com/mrmlnc/fast-glob#pattern-syntax
+  const resourcesWithForwardSlashes = resources.map((r) => r.replace(/\\/g, '/'))
+
+  await each(globs(resourcesWithForwardSlashes, { cwd, onlyFiles: true }), async (file) => {
     count++
     step.log(`Including file: ${file}`)
     await compiler.addResource(file)
   })
-  step.log(`Included ${count} file(s). ${(compiler.resourceSize / 1e6).toFixed(3)} MB`)
+  step.log(`Included ${count} file(s)`)
   return next()
 }

src/steps/shim.ts

@@ -1,10 +1,11 @@
 import { NexeCompiler } from '../compiler'
 import { wrap } from '../util'
 
-export default function(compiler: NexeCompiler, next: () => Promise<void>) {
+export default async function (compiler: NexeCompiler, next: () => Promise<void>) {
+  await next()
   compiler.shims.push(
     wrap(
-      `process.__nexe = ${JSON.stringify(compiler.binaryConfiguration)};\n` +
+      '' +
         '{{replace:lib/fs/patch.js}}' +
         '\nshimFs(process.__nexe)' +
         `\n${compiler.options.fs ? '' : 'restoreFs()'}`
@@ -32,6 +33,4 @@ export default function(compiler: NexeCompiler, next: () => Promise<void>) {
       }
     `)
   )
-
-  return next()
 }

src/target.ts

@@ -1,8 +1,8 @@
 export type NodePlatform = 'windows' | 'mac' | 'alpine' | 'linux'
-export type NodeArch = 'x86' | 'x64' | 'arm7l' | 'arm6l' | 'arm64'
+export type NodeArch = 'x86' | 'x64' | 'arm' | 'arm64'
 
 const platforms: NodePlatform[] = ['windows', 'mac', 'alpine', 'linux'],
-  architectures: NodeArch[] = ['x86', 'x64', 'arm7l', 'arm6l', 'arm64']
+  architectures: NodeArch[] = ['x86', 'x64', 'arm', 'arm64']
 
 export { platforms, architectures }
 
@@ -21,21 +21,21 @@ const prettyPlatform: { [key: string]: NodePlatform } = {
   mac: 'mac',
   linux: 'linux',
   static: 'alpine',
-  alpine: 'alpine'
+  alpine: 'alpine',
 }
 
 const prettyArch: { [key: string]: NodeArch } = {
   x86: 'x86',
-  arm6: 'arm6l',
+  arm6: 'arm',
   arm64: 'arm64',
-  arm6l: 'arm6l',
-  arm: 'arm7l',
-  arm7: 'arm7l',
-  arm7l: 'arm7l',
+  arm6l: 'arm',
+  arm: 'arm',
+  arm7: 'arm',
+  arm7l: 'arm',
   amd64: 'x64',
   ia32: 'x86',
   x32: 'x86',
-  x64: 'x64'
+  x64: 'x64',
 }
 
 function isVersion(x: string) {
@@ -80,7 +80,7 @@ export function getTarget(target: string | Partial<NexeTarget> = ''): NexeTarget
   target
     .toLowerCase()
     .split('-')
-    .forEach(x => {
+    .forEach((x) => {
       if (isVersion(x)) {
         version = x.replace(/v/g, '')
       }

src/util.ts

@@ -1,9 +1,9 @@
 import { readFile, writeFile, stat } from 'fs'
 import { execFile } from 'child_process'
-import pify = require('pify')
+import { promisify } from 'util'
 import rimraf = require('rimraf')
 
-const rimrafAsync = pify(rimraf)
+const rimrafAsync = promisify(rimraf)
 export const STDIN_FLAG = '[stdin]'
 
 export async function each<T>(
@@ -42,10 +42,10 @@ const bound: MethodDecorator = function bound<T>(
       Object.defineProperty(this, propertyKey as string, {
         configurable,
         value,
-        writable: true
+        writable: true,
       })
       return value
-    }
+    },
   }
 }
 
@@ -64,21 +64,21 @@ export interface ReadFileAsync {
   (path: string, encoding: string): Promise<string>
 }
 
-const readFileAsync = pify(readFile)
-const writeFileAsync = pify(writeFile)
-const statAsync = pify(stat)
-const execFileAsync = pify(execFile)
+const readFileAsync = promisify(readFile)
+const writeFileAsync = promisify(writeFile)
+const statAsync = promisify(stat)
+const execFileAsync = promisify(execFile)
 const isWindows = process.platform === 'win32'
 
 function pathExistsAsync(path: string) {
   return statAsync(path)
-    .then(x => true)
+    .then((x) => true)
     .catch(falseOnEnoent)
 }
 
 function isDirectoryAsync(path: string) {
   return statAsync(path)
-    .then(x => x.isDirectory())
+    .then((x) => x.isDirectory())
     .catch(falseOnEnoent)
 }
 /**
@@ -109,5 +109,5 @@ export {
   readFileAsync,
   pathExistsAsync,
   isDirectoryAsync,
-  writeFileAsync
+  writeFileAsync,
 }

tasks/build.ts

@@ -1,5 +1,5 @@
 import * as nexe from '../lib/nexe'
-import { getUnBuiltReleases, getV3GitRelease } from '../lib/releases'
+import { getUnBuiltReleases, getLatestGitRelease } from '../lib/releases'
 import { runDockerBuild } from './docker'
 import { getTarget, targetsEqual, NexeTarget } from '../lib/target'
 import { pathExistsAsync, readFileAsync, execFileAsync, semverGt } from '../lib/util'
@@ -14,12 +14,12 @@ const env = process.env,
   isMac = process.platform === 'darwin',
   headers = {
     Authorization: 'token ' + env.GITHUB_TOKEN,
-    'User-Agent': 'nexe (https://www.npmjs.com/package/nexe)'
+    'User-Agent': 'nexe (https://www.npmjs.com/package/nexe)',
   }
 
 if (require.main === module) {
   if (!isPullRequest) {
-    build().catch(x => {
+    build().catch((x) => {
       console.error(x)
       process.exit(1)
     })
@@ -31,10 +31,10 @@ async function build() {
   if (!releases.length) {
     return
   }
-  const windowsBuild = releases.find(x => x.platform === 'windows'),
-    macBuild = releases.find(x => x.platform === 'mac'),
-    linux = releases.find(x => x.platform === 'linux'),
-    alpine = releases.find(x => x.platform === 'alpine')
+  const windowsBuild = releases.find((x) => x.platform === 'windows'),
+    macBuild = releases.find((x) => x.platform === 'mac'),
+    linux = releases.find((x) => x.platform === 'linux'),
+    alpine = releases.find((x) => x.platform === 'alpine')
 
   let target: NexeTarget | undefined
 
@@ -62,7 +62,7 @@ async function build() {
       verbose: Boolean(env.NEXE_VERBOSE!),
       target,
       make: ['-j' + cpus().length],
-      output
+      output,
     }
   console.log('Building: ' + target + ' on ' + buildHost)
   const stop = keepalive()
@@ -78,9 +78,9 @@ async function build() {
   stop()
   if (await pathExistsAsync(output)) {
     await assertNexeBinary(output)
-    const gitRelease = await getV3GitRelease({ headers }),
+    const gitRelease = await getLatestGitRelease({ headers }),
       unbuiltReleases = await getUnBuiltReleases({ headers })
-    if (!unbuiltReleases.some(x => targetsEqual(x, target!))) {
+    if (!unbuiltReleases.some((x) => targetsEqual(x, target!))) {
       console.log(`${target} already uploaded.`)
       process.exit(0)
       return
@@ -90,9 +90,9 @@ async function build() {
       body: await readFileAsync(output),
       headers: {
         ...headers,
-        'Content-Type': 'application/octet-stream'
-      }
-    }).catch(reason => {
+        'Content-Type': 'application/octet-stream',
+      },
+    }).catch((reason) => {
       console.log(reason && reason.response && reason.response.body)
       throw reason
     })
@@ -107,7 +107,7 @@ function keepalive() {
 }
 
 function assertNexeBinary(file: string) {
-  return execFileAsync(file).catch(e => {
+  return execFileAsync(file).catch((e) => {
     if (e && e.stack && e.stack.includes('Invalid Nexe binary')) {
       return
     }

tasks/docker.ts

@@ -6,7 +6,7 @@ import { appendFileSync } from 'fs'
 
 function alpine(target: NexeTarget) {
   return `
-FROM ${target.arch === 'x64' ? '' : 'i386/'}alpine:3.4
+FROM ${target.arch === 'x64' ? '' : 'i386/'}alpine:3.12
 RUN apk add --no-cache curl make gcc g++ binutils-gold python linux-headers paxctl libgcc libstdc++ git vim tar gzip wget
 ENV NODE_VERSION=${target.version}
 ENV NEXE_VERSION=latest
@@ -46,10 +46,10 @@ export async function runDockerBuild(target: NexeTarget) {
   let output: any = []
 
   try {
-    output.push(await execa.shell(`docker build -t nexe-docker .`))
-    output.push(await execa.shell(`docker run -d --name nexe nexe-docker sh`))
-    output.push(await execa.shell(`docker cp nexe:/out out`))
-    output.push(await execa.shell(`docker rm nexe`))
+    output.push(await execa(`docker build -t nexe-docker .`, { shell: true }))
+    output.push(await execa(`docker run -d --name nexe nexe-docker sh`, { shell: true }))
+    output.push(await execa(`docker cp nexe:/out out`, { shell: true }))
+    output.push(await execa(`docker rm nexe`, { shell: true }))
   } catch (e) {
     console.log('Error running docker')
     appendFileSync(outFilename, e.message)
@@ -58,16 +58,11 @@ export async function runDockerBuild(target: NexeTarget) {
       appendFileSync(outFilename, x.stderr)
       appendFileSync(outFilename, x.stdout)
     })
-    await got(
-      `https://transfer.sh/${Math.random()
-        .toString(36)
-        .substring(2)}.txt`,
-      {
-        body: await readFileAsync(outFilename),
-        method: 'PUT'
-      }
-    )
-      .then(x => console.log('Posted docker log: ', x.body))
-      .catch(e => console.log('Error posting log', e))
+    await got(`https://transfer.sh/${Math.random().toString(36).substring(2)}.txt`, {
+      body: await readFileAsync(outFilename),
+      method: 'PUT',
+    })
+      .then((x) => console.log('Posted docker log: ', x.body))
+      .catch((e) => console.log('Error posting log', e))
   }
 }

test/options.spec.ts

@@ -39,6 +39,26 @@ describe('options', () => {
       expect(options.output).to.equal(path.resolve(cwd, `abc${ext}`))
     })
   })
+
+  describe('remote', () => {
+    it('should use default remote', () => {
+      const options = normalizeOptions({})
+      expect(options.remote).to.equal('https://github.com/nexe/nexe/releases/download/v3.3.3/')
+    })
+    it('should append trailing slash to third-party remote if necessary', () => {
+      const options = normalizeOptions({
+        remote: 'https://sitejs.org/nexe'
+      })
+      expect(options.remote).to.equal('https://sitejs.org/nexe/')
+    })
+    it('should not append trailing slash to third-party remote that already has one', () => {
+      const options = normalizeOptions({
+        remote: 'https://sitejs.org/nexe/'
+      })
+      expect(options.remote).to.equal('https://sitejs.org/nexe/')
+    })
+  })
+
   describe('output', () => {
     it('should work', () => {
       const options = normalizeOptions({

tsconfig.json

@@ -1,6 +1,6 @@
 {
   "compilerOptions": {
-    "target":"es5",
+    "target":"es2015",
     "skipLibCheck": true,
     "experimentalDecorators": true,
     "lib": ["es2018"],