Compare commits

..

4 Commits

Author SHA1 Message Date
calebboyd 58f276fae6 chore: bump resolve-dependencies 2020-06-26 11:42:23 -05:00
calebboyd 7c539db738 chore: bump resolve-dependencies 2020-06-26 10:26:53 -05:00
calebboyd ae51cc6b87 fix: set explicit release 2020-06-21 20:16:45 -05:00
calebboyd cf23147c9c fix: windows build 10.16 2019-06-24 15:57:54 -05:00
68 changed files with 4337 additions and 8712 deletions
-1
View File
@@ -1 +0,0 @@
custom: https://www.paypal.me/calebsboyd
-23
View File
@@ -1,23 +0,0 @@
---
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:
-11
View File
@@ -1,11 +0,0 @@
---
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**:
-11
View File
@@ -1,11 +0,0 @@
**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**:
-4
View File
@@ -1,4 +0,0 @@
FROM node:fermium-alpine3.10
RUN apk add --no-cache build-base linux-headers bash clang python3
SHELL ["/bin/bash", "--login", "-c"]
CMD ["bash"]
-16
View File
@@ -1,16 +0,0 @@
# action.yml
name: 'Hello World'
description: 'Greet someone and record the time'
inputs:
who-to-greet: # id of input
description: 'Who to greet'
required: true
default: 'World'
outputs:
time: # id of output
description: 'The time we greeted you'
runs:
using: 'docker'
image: 'Dockerfile'
args:
- ${{ inputs.who-to-greet }}
-23
View File
@@ -1,23 +0,0 @@
FROM centos:7
RUN yum install -y which centos-release-scl && \
yum install -y devtoolset-9-gcc \
devtoolset-9-gcc-c++ \
make \
wget \
python3 && \
echo "source /opt/rh/devtoolset-9/enable" >> /etc/bashrc
SHELL ["/bin/bash", "--login", "-c"]
ADD flags.sh flags.sh
ARG NODE_VERSION=14.20.0
RUN wget https://nodejs.org/dist/v${NODE_VERSION}/node-v${NODE_VERSION}.tar.gz -O node.tar.gz && \
mkdir node && tar -zxf node.tar.gz -C node --strip-components=1 && \
rm node.tar.gz && \
cd node && \
. ../flags.sh && \
./configure $(echo $CONFIGURE_FLAGS) && \
make $(echo $MAKE_FLAGS) && make install
-16
View File
@@ -1,16 +0,0 @@
# action.yml
name: 'Hello World'
description: 'Greet someone and record the time'
inputs:
who-to-greet: # id of input
description: 'Who to greet'
required: true
default: 'World'
outputs:
time: # id of output
description: 'The time we greeted you'
runs:
using: 'docker'
image: 'Dockerfile'
args:
- ${{ inputs.who-to-greet }}
-18
View File
@@ -1,18 +0,0 @@
#!/bin/bash
ARCH=$(uname -m)
case $ARCH in
"x86_64")
CONFIGURE_FLAGS="--dest-cpu=x64"
;;
"aarch64")
;&
"armv7l")
CONFIGURE_FLAGS="--openssl-no-asm --dest-cpu=arm --with-arm-float-abi=hard"
;;
*)
CONFIGURE_FLAGS=""
;;
esac
MAKE_FLAGS="-j$(getconf _NPROCESSORS_ONLN)"
@@ -1,20 +0,0 @@
name: No Response
# Both `issue_comment` and `scheduled` event types are required for this Action
# to work properly.
on:
issue_comment:
types: [created]
schedule:
- cron: '0 14 * * *'
jobs:
noResponse:
runs-on: ubuntu-latest
steps:
- uses: lee-dohm/no-response@v0.5.0
with:
token: ${{ github.token }}
closeComment: 'Closed awaiting response from OP, please open a new issue with the requested information and/or examples'
daysUntilClose: 21
responseRequiredLabel: more-information-needed
-52
View File
@@ -1,52 +0,0 @@
name: Base Builds
on:
push:
branches:
- refactor-old-node
jobs:
build:
strategy:
fail-fast: false
matrix:
version: ['14.20.0', '16.16.0', '18.5.0']
arch: [x64, x86]
plat: [arm, macos, windows, linux, alpine]
exclude:
- plat: arm
arch: x86
- plat: macos
arch: x86
include:
- plat: arm
os: ubuntu-20.04
- plat: macos
os: macos-12
- plat: windows
os: windows-2022
- plat: linux
os: ubuntu-20.04
- plat: alpine
os: ubuntu-20.04
name: 'Target: ${{matrix.plat}}-${{ matrix.arch }}-${{ matrix.version }} on ${{ matrix.os }}'
runs-on: ${{ matrix.os }}
steps:
- name: Setup Python
uses: actions/setup-python@v3.1.2
with:
python-version: '3.10.4'
- name: Setup Nasm
if: ${{ matrix.plat == 'windows' }}
uses: ilammy/setup-nasm@v1.3.0
- uses: actions/setup-node@v3
with:
node-version: ${{ matrix.version }}
- uses: actions/checkout@v3
with:
node-version: 18
- name: 'Install Dependencies'
run: npm ci
- name: 'Build nexe base binary'
env:
NEXE_TARGET: ${{ matrix.plat }}-${{ matrix.arch }}-${{ matrix.version }}
run: npx ts-node tasks/build.ts
-1
View File
@@ -1 +0,0 @@
18.12.1
-19
View File
@@ -1,19 +0,0 @@
{
"module": {
"type": "commonjs",
"ignoreDynamic": true
},
"jsc": {
"parser": {
"syntax": "typescript",
"dynamicImport": true,
"decorators": true
},
"transform": {
"legacyDecorator": true
},
"target": "es2019",
"externalHelpers": false
}
}
+1 -4
View File
@@ -1,6 +1,3 @@
{ {
"recommendations": [ "recommendations": [ "ms-vscode.vscode-typescript-tslint-plugin" ]
"esbenp.prettier-vscode",
"dbaeumer.vscode-eslint"
]
} }
+4 -28
View File
@@ -1,4 +1,7 @@
{ {
"tslint.enable": true,
"tslint.run": "onType",
"tslint.autoFixOnSave": true,
"files.exclude": { "files.exclude": {
"**/.git": true, "**/.git": true,
"**/.svn": true, "**/.svn": true,
@@ -11,32 +14,5 @@
"**/node_modules": true, "**/node_modules": true,
"**/bower_components": true "**/bower_components": true
}, },
"eslint.workingDirectories": [{ "mode": "auto" }], "typescript.tsdk": "node_modules\\typescript\\lib"
"eslint.format.enable": true,
"editor.formatOnSave": true,
"eslint.validate": [
"javascript",
"javascriptreact",
"typescript",
"typescriptreact"
],
"[javascript]": {
"editor.formatOnSave": true,
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"[javascriptreact]": {
"editor.formatOnSave": true,
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"[typescript]": {
"editor.formatOnSave": true,
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"[typescriptreact]": {
"editor.formatOnSave": true,
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"editor.codeActionsOnSave": {
"source.fixAll.eslint": true
}
} }
+1 -1
View File
@@ -1,4 +1,4 @@
Copyright (c) 2013-2022 Nexe Contributors Copyright (c) 2013-2018 Nexe Contributors
Permission is hereby granted, free of charge, to any person obtaining Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the a copy of this software and associated documentation files (the
+43 -57
View File
@@ -1,4 +1,3 @@
<p align="center"><img src="https://cloud.githubusercontent.com/assets/2391349/23598327/a17bb68a-01ee-11e7-8f55-88a5fc96e997.png" /></p> <p align="center"><img src="https://cloud.githubusercontent.com/assets/2391349/23598327/a17bb68a-01ee-11e7-8f55-88a5fc96e997.png" /></p>
<p align="center"> <p align="center">
@@ -6,10 +5,9 @@
<a href="https://www.npmjs.com/package/nexe"><img src="https://img.shields.io/npm/dt/nexe.svg" alt="Downloads"></a> <a href="https://www.npmjs.com/package/nexe"><img src="https://img.shields.io/npm/dt/nexe.svg" alt="Downloads"></a>
<a href="https://www.npmjs.com/package/nexe"><img src="https://img.shields.io/npm/v/nexe.svg" alt="Version"></a> <a href="https://www.npmjs.com/package/nexe"><img src="https://img.shields.io/npm/v/nexe.svg" alt="Version"></a>
<a href="https://www.npmjs.com/package/nexe"><img src="https://img.shields.io/npm/l/nexe.svg" alt="License"></a> <a href="https://www.npmjs.com/package/nexe"><img src="https://img.shields.io/npm/l/nexe.svg" alt="License"></a>
<a href="https://discord.gg/2qTH52zNcZ"><img src="https://discordapp.com/api/guilds/814334925049561168/widget.png?style=shield"></a>
</p> </p>
<p align="center">Install:&nbsp<code>npm i nexe -g</code></p> <p align="center"><code>npm i nexe -g</code></p>
<p align="center">Nexe is a command-line utility that compiles your Node.js application into a single executable file.</p> <p align="center">Nexe is a command-line utility that compiles your Node.js application into a single executable file.</p>
<p align="center"> <p align="center">
@@ -23,7 +21,7 @@
- Distribute binaries without needing node / npm. - Distribute binaries without needing node / npm.
- Idempotent builds - Idempotent builds
- Start and deploy faster. - Start and deploy faster.
- Lock-down specific application versions, and easily rollback. - Lockdown specific application versions, and easily rollback.
- Flexible build pipeline - Flexible build pipeline
- Cross platform builds - Cross platform builds
@@ -49,38 +47,10 @@ For more CLI options see: `nexe --help`
Additional files or resources can be added to the binary by passing `-r "glob/pattern/**/*"`. These included files can be read in the application by using `fs.readFile` or `fs.readFileSync`. Additional files or resources can be added to the binary by passing `-r "glob/pattern/**/*"`. These included files can be read in the application by using `fs.readFile` or `fs.readFileSync`.
## Compiling the nexe Executable ## Compiling Node
By default `nexe` will attempt to download a pre-built executable. These are listed on the [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 3; you can create a [symlink](https://github.com/nexe/nexe/issues/354#issuecomment-319874486) or use the `--python` parameter (e.g. `nexe --build --python=$(which python3)`). 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).
### Linux and macOS
[Prerequisites & details](https://github.com/nodejs/node/blob/master/BUILDING.md#unix-and-macos)
### Windows
The fastest and most reliable way to get started is simply to run the commands below. If you'd rather read the details or perform a manual install of the prerequisites, [you can find that here](https://github.com/nodejs/node/blob/master/BUILDING.md#windows).
The instructions below are the fastest and most reliable method.
Run the following sets of commands with PowerShell (running as Administrator).
**Install all required build tools (and dependencies):**
```
Set-ExecutionPolicy Unrestricted -Force
iex ((New-Object System.Net.WebClient).DownloadString('https://boxstarter.org/bootstrapper.ps1'))
get-boxstarter -Force
Install-BoxstarterPackage https://raw.githubusercontent.com/nodejs/node/master/tools/bootstrap/windows_boxstarter -DisableReboots
```
**Set config:**
```
npm config set msvs_version 2019
npm config set python python3.8
```
Where `2019` is the version of Visual Studio you have (if you have it).
**Notes:**
- Python 3 and Python 2 can coexist and `nexe` will still work, considering the `set config` area above
- Don't use `npm install windows-build-tools` unless you're having some type of issue, because the above commands configures and installs the latest/preferred too.
## Node.js API ## Node.js API
@@ -116,14 +86,14 @@ compile({
- Output executable file path - Output executable file path
- default: same as `name` with an OS specific extension. - default: same as `name` with an OS specific extension.
- #### `target: string | object` - #### `target: string | object`
- An object or string describing platform-arch-version. e.g. `'windows-ia32-18.1.0'` - An object or string describing platform-arch-version. e.g. `'windows-ia32-10.13.0'`
- each segment is optional, and will be merged with the current environment - each segment is optional, and will be merged with the current environment
- Examples: ([full list](https://github.com/nexe/nexe/releases)) - Examples: ([full list](https://github.com/nexe/nexe/releases))
- `'win32-x86-18.1.0` - `'win32-x86-10.13.0`
- `{ platform: 'alpine' }` - `{ platform: 'alpine' }`
- `darwin-14.19.1` - `darwin-10.13.0`
- `linux-x64` - `linux-x64`
- `macos-16.15.0` - `macos-10.13.0`
See [test/target.spec.ts](test/target.spec.ts) See [test/target.spec.ts](test/target.spec.ts)
- If the [`build`](#build-boolean) flag is set, the platform portion of the target is ignored. - If the [`build`](#build-boolean) flag is set, the platform portion of the target is ignored.
@@ -147,13 +117,11 @@ compile({
- default: true - default: true
- #### `build: boolean` - #### `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) - 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)
- #### `remote: string`
- Provide a custom remote location for fetching pre-built nexe binaries from. This can either be an HTTP or HTTPS URL.
- default: `null`
- #### `asset: string` - #### `asset: string`
- Provide a pre-built nexe binary asset, this is a file path is resolved relative to cwd. - Provide a pre-built nexe binary asset, this can either be an http or https URL or a file path.
- default: `null`
- #### `python: string` - #### `python: string`
- On Linux this is the path pointing to your python3 executable - On Linux this is the path pointing to your python2 executable
- On Windows this is the directory where `python` can be accessed - On Windows this is the directory where `python` can be accessed
- default: `null` - default: `null`
- #### `flags: string[]` - #### `flags: string[]`
@@ -170,6 +138,9 @@ compile({
- #### `vcBuild: string[]` - #### `vcBuild: string[]`
- Options for windows build - Options for windows build
- default: `['nosign', 'release']` - default: `['nosign', 'release']`
- #### `snapshot: string`
- path to a file to be used as the warmup snapshot for the build
- default: `null`
- #### `resources: string[]` - #### `resources: string[]`
- Array of globs with files to include in the build - Array of globs with files to include in the build
- Example: `['./public/**/*']` - Example: `['./public/**/*']`
@@ -178,6 +149,20 @@ compile({
- Path to use for storing nexe's build files - Path to use for storing nexe's build files
- Override in the env with `NEXE_TEMP` - Override in the env with `NEXE_TEMP`
- default: `~/.nexe` - default: `~/.nexe`
- #### `ico: string`
- Path to a user provided icon to be used (Windows only). Requires `--build` to be set.
- #### `rc: object`
- Settings for patching the [node.rc](https://github.com/nodejs/node/blob/master/src/res/node.rc) configuration file (Windows only).
- Example (keys may vary depending on the version. Reference the file linked above):
```javascript
{
CompanyName: "ACME Corp",
PRODUCTVERSION: "17,3,0,0",
FILEVERSION: "1,2,3,4"
...
}
```
- default: `{}`
- #### `clean: boolean` - #### `clean: boolean`
- If included, nexe will remove temporary files for the accompanying configuration and exit - If included, nexe will remove temporary files for the accompanying configuration and exit
- #### `enableNodeCli: boolean` - #### `enableNodeCli: boolean`
@@ -218,7 +203,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` - 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>` - `readFileAsync(filename: string): Promise<NexeFile>`
- Access (or create) a file within the downloaded Node.js source. - Access (or create) a file within the downloaded Node.js source.
- `addResource(filename: string, contents: Buffer): Promise<void>` - `addResource(filename: string, contents: Buffer): void`
- Add a resource to the nexe bundle - Add a resource to the nexe bundle
- `files: NexeFile[]` - `files: NexeFile[]`
- The cache of the currently read, modified, or created files within the downloaded Node.js source. - The cache of the currently read, modified, or created files within the downloaded Node.js source.
@@ -232,18 +217,9 @@ Any modifications made to `NexeFile#contents` will be maintained in the cache _w
## Native Modules ## Native Modules
In order to use native modules, the native binaries must be shipped alongside the binary generated by nexe. TODO
## Troubleshooting - [ ] Implement support for `node-pre-gyp#find`.
`Error: https://github.com/nexe/nexe/releases/download/v3.3.3/windows-x64-15.8.0 is not available, create it using the --build flag` or similar message means that it either:
- You are having networking issues such as the download being blocked
- You should specify the target so `nexe` knows what version of the executable to use.
- See the [releases page](https://github.com/nexe/nexe/releases) to find the executable's version number
- Example
- `nexe -i "app.js" -r "public/**/*.html" -o "dist/myApp.exe" -t x64-18.1.0`
- where `-i` specifies the input, `-r` specifies resources to embed, `-o` specifies the output, `-t` specifies the target.
- Alternatively you can compile the executable yourself, see that section for details
## Contributing ## Contributing
@@ -251,10 +227,20 @@ Building
``` ```
$ git clone git@github.com:nexe/nexe.git $ git clone git@github.com:nexe/nexe.git
$ cd nexe $ cd nexe
$ npm i && npm run build $ yarn
``` ```
Testing Testing
``` ```
$ npm test $ 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/)
+60
View File
@@ -0,0 +1,60 @@
schedules:
- cron: "0 8 * * *"
displayName: "Daily Build 1"
always: true
branches:
include:
- master
- cron: "0 13 * * *"
displayName: "Daily Build 2"
always: true
branches:
include:
- master
- cron: "0 19 * * *"
displayName: "Daily Build 3"
always: true
branches:
include:
- master
jobs:
- job: BaseBuild
timeoutInMinutes: 180
strategy:
matrix:
linux:
imageName: 'ubuntu-16.04'
mac:
imageName: 'macos-10.13'
windows_2017:
imageName: 'vs2017-win2016'
windows_2015:
imageName: 'vs2017-win2016'
alpine:
imageName: 'ubuntu-16.04'
pool:
vmImage: $(imageName)
steps:
- task: UsePythonVersion@0
displayName: Setup Python
inputs:
versionSpec: '2.7'
architecture: 'x64'
- task: NodeTool@0
displayName: Install Node
inputs:
versionSpec: '10.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)
-13
View File
@@ -1,13 +0,0 @@
FROM centos:7
RUN yum install -y which centos-release-scl \
&& yum install -y devtoolset-9-gcc \
devtoolset-9-gcc-c++ \
make \
python3 \
curl \
&& curl -sL https://rpm.nodesource.com/setup_16.x | bash - \
&& yum install -y nodejs && npm install nexe -g \
&& echo "source /opt/rh/devtoolset-9/enable" >> /etc/bashrc
SHELL ["/bin/bash", "--login", "-c"]
-4
View File
@@ -1,4 +0,0 @@
FROM node:16-alpine
RUN apk add --no-cache build-base linux-headers bash clang python3
SHELL ["/bin/bash", "--login", "-c"]
CMD ["bash"]
+8
View File
@@ -0,0 +1,8 @@
const express = require('express')
const path = require('path')
const app = express()
app.use('/', express.static(path.join(__dirname, 'public')))
app.listen(8888)
+373
View File
@@ -0,0 +1,373 @@
{
"name": "express-app",
"version": "1.0.0",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
"accepts": {
"version": "1.3.5",
"resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.5.tgz",
"integrity": "sha1-63d99gEXI6OxTopywIBcjoZ0a9I=",
"requires": {
"mime-types": "~2.1.18",
"negotiator": "0.6.1"
}
},
"array-flatten": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
"integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI="
},
"body-parser": {
"version": "1.18.2",
"resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.18.2.tgz",
"integrity": "sha1-h2eKGdhLR9hZuDGZvVm84iKxBFQ=",
"requires": {
"bytes": "3.0.0",
"content-type": "~1.0.4",
"debug": "2.6.9",
"depd": "~1.1.1",
"http-errors": "~1.6.2",
"iconv-lite": "0.4.19",
"on-finished": "~2.3.0",
"qs": "6.5.1",
"raw-body": "2.3.2",
"type-is": "~1.6.15"
}
},
"bytes": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
"integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg="
},
"content-disposition": {
"version": "0.5.2",
"resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.2.tgz",
"integrity": "sha1-DPaLud318r55YcOoUXjLhdunjLQ="
},
"content-type": {
"version": "1.0.4",
"resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
"integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA=="
},
"cookie": {
"version": "0.3.1",
"resolved": "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz",
"integrity": "sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s="
},
"cookie-signature": {
"version": "1.0.6",
"resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
"integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw="
},
"debug": {
"version": "2.6.9",
"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
"requires": {
"ms": "2.0.0"
}
},
"depd": {
"version": "1.1.2",
"resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
"integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak="
},
"destroy": {
"version": "1.0.4",
"resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
"integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA="
},
"ee-first": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
"integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0="
},
"encodeurl": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
"integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k="
},
"escape-html": {
"version": "1.0.3",
"resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
"integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg="
},
"etag": {
"version": "1.8.1",
"resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
"integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc="
},
"express": {
"version": "4.16.3",
"resolved": "https://registry.npmjs.org/express/-/express-4.16.3.tgz",
"integrity": "sha1-avilAjUNsyRuzEvs9rWjTSL37VM=",
"requires": {
"accepts": "~1.3.5",
"array-flatten": "1.1.1",
"body-parser": "1.18.2",
"content-disposition": "0.5.2",
"content-type": "~1.0.4",
"cookie": "0.3.1",
"cookie-signature": "1.0.6",
"debug": "2.6.9",
"depd": "~1.1.2",
"encodeurl": "~1.0.2",
"escape-html": "~1.0.3",
"etag": "~1.8.1",
"finalhandler": "1.1.1",
"fresh": "0.5.2",
"merge-descriptors": "1.0.1",
"methods": "~1.1.2",
"on-finished": "~2.3.0",
"parseurl": "~1.3.2",
"path-to-regexp": "0.1.7",
"proxy-addr": "~2.0.3",
"qs": "6.5.1",
"range-parser": "~1.2.0",
"safe-buffer": "5.1.1",
"send": "0.16.2",
"serve-static": "1.13.2",
"setprototypeof": "1.1.0",
"statuses": "~1.4.0",
"type-is": "~1.6.16",
"utils-merge": "1.0.1",
"vary": "~1.1.2"
}
},
"finalhandler": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.1.tgz",
"integrity": "sha512-Y1GUDo39ez4aHAw7MysnUD5JzYX+WaIj8I57kO3aEPT1fFRL4sr7mjei97FgnwhAyyzRYmQZaTHb2+9uZ1dPtg==",
"requires": {
"debug": "2.6.9",
"encodeurl": "~1.0.2",
"escape-html": "~1.0.3",
"on-finished": "~2.3.0",
"parseurl": "~1.3.2",
"statuses": "~1.4.0",
"unpipe": "~1.0.0"
}
},
"forwarded": {
"version": "0.1.2",
"resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz",
"integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ="
},
"fresh": {
"version": "0.5.2",
"resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
"integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac="
},
"http-errors": {
"version": "1.6.3",
"resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
"integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=",
"requires": {
"depd": "~1.1.2",
"inherits": "2.0.3",
"setprototypeof": "1.1.0",
"statuses": ">= 1.4.0 < 2"
}
},
"iconv-lite": {
"version": "0.4.19",
"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.19.tgz",
"integrity": "sha512-oTZqweIP51xaGPI4uPa56/Pri/480R+mo7SeU+YETByQNhDG55ycFyNLIgta9vXhILrxXDmF7ZGhqZIcuN0gJQ=="
},
"inherits": {
"version": "2.0.3",
"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
"integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
},
"ipaddr.js": {
"version": "1.8.0",
"resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.8.0.tgz",
"integrity": "sha1-6qM9bd16zo9/b+DJygRA5wZzix4="
},
"media-typer": {
"version": "0.3.0",
"resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
"integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g="
},
"merge-descriptors": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
"integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E="
},
"methods": {
"version": "1.1.2",
"resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
"integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4="
},
"mime": {
"version": "1.4.1",
"resolved": "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz",
"integrity": "sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ=="
},
"mime-db": {
"version": "1.35.0",
"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.35.0.tgz",
"integrity": "sha512-JWT/IcCTsB0Io3AhWUMjRqucrHSPsSf2xKLaRldJVULioggvkJvggZ3VXNNSRkCddE6D+BUI4HEIZIA2OjwIvg=="
},
"mime-types": {
"version": "2.1.19",
"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.19.tgz",
"integrity": "sha512-P1tKYHVSZ6uFo26mtnve4HQFE3koh1UWVkp8YUC+ESBHe945xWSoXuHHiGarDqcEZ+whpCDnlNw5LON0kLo+sw==",
"requires": {
"mime-db": "~1.35.0"
}
},
"ms": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
},
"negotiator": {
"version": "0.6.1",
"resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.1.tgz",
"integrity": "sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk="
},
"on-finished": {
"version": "2.3.0",
"resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
"integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=",
"requires": {
"ee-first": "1.1.1"
}
},
"parseurl": {
"version": "1.3.2",
"resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.2.tgz",
"integrity": "sha1-/CidTtiZMRlGDBViUyYs3I3mW/M="
},
"path-to-regexp": {
"version": "0.1.7",
"resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
"integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w="
},
"proxy-addr": {
"version": "2.0.4",
"resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.4.tgz",
"integrity": "sha512-5erio2h9jp5CHGwcybmxmVqHmnCBZeewlfJ0pex+UW7Qny7OOZXTtH56TGNyBizkgiOwhJtMKrVzDTeKcySZwA==",
"requires": {
"forwarded": "~0.1.2",
"ipaddr.js": "1.8.0"
}
},
"qs": {
"version": "6.5.1",
"resolved": "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz",
"integrity": "sha512-eRzhrN1WSINYCDCbrz796z37LOe3m5tmW7RQf6oBntukAG1nmovJvhnwHHRMAfeoItc1m2Hk02WER2aQ/iqs+A=="
},
"range-parser": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.0.tgz",
"integrity": "sha1-9JvmtIeJTdxA3MlKMi9hEJLgDV4="
},
"raw-body": {
"version": "2.3.2",
"resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.3.2.tgz",
"integrity": "sha1-vNYMd9Prk83gBQKVw/N5OJvIj4k=",
"requires": {
"bytes": "3.0.0",
"http-errors": "1.6.2",
"iconv-lite": "0.4.19",
"unpipe": "1.0.0"
},
"dependencies": {
"depd": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/depd/-/depd-1.1.1.tgz",
"integrity": "sha1-V4O04cRZ8G+lyif5kfPQbnoxA1k="
},
"http-errors": {
"version": "1.6.2",
"resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.2.tgz",
"integrity": "sha1-CgAsyFcHGSp+eUbO7cERVfYOxzY=",
"requires": {
"depd": "1.1.1",
"inherits": "2.0.3",
"setprototypeof": "1.0.3",
"statuses": ">= 1.3.1 < 2"
}
},
"setprototypeof": {
"version": "1.0.3",
"resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.3.tgz",
"integrity": "sha1-ZlZ+NwQ+608E2RvWWMDL77VbjgQ="
}
}
},
"safe-buffer": {
"version": "5.1.1",
"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
"integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg=="
},
"send": {
"version": "0.16.2",
"resolved": "https://registry.npmjs.org/send/-/send-0.16.2.tgz",
"integrity": "sha512-E64YFPUssFHEFBvpbbjr44NCLtI1AohxQ8ZSiJjQLskAdKuriYEP6VyGEsRDH8ScozGpkaX1BGvhanqCwkcEZw==",
"requires": {
"debug": "2.6.9",
"depd": "~1.1.2",
"destroy": "~1.0.4",
"encodeurl": "~1.0.2",
"escape-html": "~1.0.3",
"etag": "~1.8.1",
"fresh": "0.5.2",
"http-errors": "~1.6.2",
"mime": "1.4.1",
"ms": "2.0.0",
"on-finished": "~2.3.0",
"range-parser": "~1.2.0",
"statuses": "~1.4.0"
}
},
"serve-static": {
"version": "1.13.2",
"resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.13.2.tgz",
"integrity": "sha512-p/tdJrO4U387R9oMjb1oj7qSMaMfmOyd4j9hOFoxZe2baQszgHcSWjuya/CiT5kgZZKRudHNOA0pYXOl8rQ5nw==",
"requires": {
"encodeurl": "~1.0.2",
"escape-html": "~1.0.3",
"parseurl": "~1.3.2",
"send": "0.16.2"
}
},
"setprototypeof": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
"integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ=="
},
"statuses": {
"version": "1.4.0",
"resolved": "https://registry.npmjs.org/statuses/-/statuses-1.4.0.tgz",
"integrity": "sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew=="
},
"type-is": {
"version": "1.6.16",
"resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.16.tgz",
"integrity": "sha512-HRkVv/5qY2G6I8iab9cI7v1bOIdhm94dVjQCPFElW9W+3GeDOSHmy2EBYe4VTApuzolPcmgFTN3ftVJRKR2J9Q==",
"requires": {
"media-typer": "0.3.0",
"mime-types": "~2.1.18"
}
},
"unpipe": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
"integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw="
},
"utils-merge": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
"integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM="
},
"vary": {
"version": "1.1.2",
"resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
"integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw="
}
}
}
+15
View File
@@ -0,0 +1,15 @@
{
"name": "express-app",
"version": "1.0.0",
"description": "",
"main": "index.js",
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
},
"keywords": [],
"author": "",
"license": "ISC",
"dependencies": {
"express": "^4.16.3"
}
}
+1
View File
@@ -0,0 +1 @@
<h1>Hello World!</h1>
+28 -41
View File
@@ -1,45 +1,32 @@
#!/usr/bin/env node #!/usr/bin/env node
const options = require('./lib/options')
/* eslint-disable no-undef */
/* eslint-disable @typescript-eslint/no-var-requires */
const eol = require('os').EOL
async function main() {
const util = require('./lib/cjs/util.js')
await util.initEsm()
const color = util.color,
options = require('./lib/cjs/options.js'),
nexe = require('./lib/cjs/nexe.js'),
NexeError = require('./lib/cjs/compiler.js').NexeError,
del = eol + eol,
argv = options.argv,
showHelp = argv.help || argv._.some((x) => x === 'help'),
showVersion = argv.version || argv._.some((x) => x === 'version')
try {
if (!(showHelp || showVersion)) {
await nexe.compile(argv)
} else {
process.stderr.write(showHelp ? options.help() : options.version + eol)
}
} catch (error) {
if (argv.loglevel !== 'silent') {
if (error instanceof NexeError) {
process.stderr.write(
`${eol}${color('red', 'Error: ')}${error.message}${del}See nexe -h for usage..${del}`
)
} else {
process.stderr.write(error.stack + eol)
}
}
process.exit(1)
}
process.exit(0)
}
if (require.main === module) { if (require.main === module) {
main() //fast path for help/version
const argv = options.argv
const eol = require('os').EOL
const showHelp = argv.help || argv._.some(x => x === 'help')
const showVersion = argv.version || argv._.some(x => x === 'version')
if (showHelp || showVersion) {
process.stderr.write(showHelp ? options.help : options.version + eol)
} else {
const nexe = require('./lib/nexe')
nexe.compile(argv).catch((error) => {
const NexeError = require('./lib/compiler').NexeError
const chalk = require('chalk')
const isSilent = Boolean(argv.silent === true || argv.loglevel === 'silent')
if (!isSilent) {
if (error instanceof NexeError) {
process.stderr.write(eol + chalk.red('Error: ') + error.message + eol
+ eol + 'See nexe -h for usage..' + eol + eol
)
} else {
process.stderr.write(error.stack + eol)
}
}
process.exit(1)
})
}
} else { } else {
process.stderr.write('Cannot require(..) the nexe cli') module.exports = require('./lib/nexe')
process.exit(1)
} }
+19
View File
@@ -0,0 +1,19 @@
<!-- 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:
+2632 -7212
View File
File diff suppressed because it is too large Load Diff
+58 -106
View File
@@ -2,123 +2,75 @@
"name": "nexe", "name": "nexe",
"description": "Create a single executable out of your Node.js application", "description": "Create a single executable out of your Node.js application",
"license": "MIT", "license": "MIT",
"type": "commonjs", "version": "3.3.5",
"version": "4.0.0-rc.local", "contributors": [
"bin": { "Craig Condon <craig.j.condon@gmail.com> (http://crcn.io)",
"nexe": "./index.js" "Jared Allard <jaredallard@outlook.com>",
}, "Caleb Boyd <caleb.boyd@hotmail.com>"
"types": "./lib/types/nexe.d.ts", ],
"main": "./lib/cjs/nexe.js", "scripts": {
"exports": { "ci:build": "ts-node tasks/build",
"./package.json": "./package.json", "test": "mocha",
".": { "lint": "tslint \"{src,plugins,tasks}/**/*.ts\" --fix",
"types": "./lib/types/nexe.d.ts", "prepare": "npm run lint && npm run build && npm test",
"node": { "prebuild": "rimraf lib",
"import": "./lib/esm/nexe.js", "build": "tsc --declaration",
"require": "./lib/cjs/nexe.js" "postbuild": "ts-node tasks/post-build"
}
}
},
"engines": {
"node": ">=14"
}, },
"repository": { "repository": {
"type": "git", "type": "git",
"url": "git://github.com/nexe/nexe.git" "url": "git://github.com/nexe/nexe.git"
}, },
"files": [ "files": [
"lib", "lib"
"index.js"
], ],
"scripts": { "typings": "lib/nexe.d.ts",
"lint": "tsc --noEmit && eslint \"{src,tasks,test}/**/*.ts\" --fix", "main": "index.js",
"test": "vitest run && node test/exports.mjs", "bin": {
"prepublishOnly": "npm run lint && npm run build && npm test", "nexe": "index.js"
"build": "npm run cjs:build & npm run esm:build", },
"prebuild": "rm -rf lib", "engines": {
"cjs:build": "swc src -d lib/cjs --copy-files", "node": ">=6"
"esm:build": "swc src -d lib/esm --copy-files -C module.type=es6",
"postbuild": "node -p \"JSON.stringify({type:'module'})\" > lib/esm/package.json && tsc --emitDeclarationOnly && ts-node tasks/post-build"
}, },
"contributors": [
"Craig Condon <craig.j.condon@gmail.com> (http://crcn.io)",
"Jared Allard <jaredallard@outlook.com>",
"Caleb Boyd <caleb.boyd@hotmail.com>"
],
"dependencies": { "dependencies": {
"@calebboyd/semaphore": "^1.3.1",
"app-builder": "^5.2.0",
"caw": "^2.0.1", "caw": "^2.0.1",
"chalk": "^5.2.0", "chalk": "^2.4.2",
"download": "^8.0.0", "cherow": "1.6.9",
"fast-glob": "^3.2.12", "download": "^7.1.0",
"got": "^12.5.3", "globby": "^9.2.0",
"meriyah": "^4.3.3", "got": "^9.6.0",
"minimist": "^1.2.7", "minimist": "^1.2.0",
"multistream": "^4.1.0", "mkdirp": "^0.5.1",
"ora": "^6.1.2", "multistream": "^2.1.1",
"resolve-dependencies": "^6.0.8" "ora": "^3.4.0",
"pify": "^4.0.1",
"resolve-dependencies": "^4.2.3",
"rimraf": "^2.6.3"
}, },
"devDependencies": { "devDependencies": {
"@swc/cli": "^0.1.57", "@types/chai": "^4.1.7",
"@swc/core": "^1.3.24", "@types/download": "^6.2.4",
"@types/minimist": "^1.2.2", "@types/execa": "^0.9.0",
"@types/multistream": "^4.1.0", "@types/globby": "^9.1.0",
"@typescript-eslint/eslint-plugin": "^5.47.0", "@types/got": "^9.6.0",
"@typescript-eslint/parser": "^5.47.0", "@types/minimist": "^1.2.0",
"eslint": "^8.30.0", "@types/mkdirp": "^0.5.2",
"eslint-config-prettier": "~8.5.0", "@types/mocha": "^5.2.7",
"eslint-plugin-import": "^2.26.0", "@types/multistream": "^2.1.1",
"eslint-plugin-prettier": "^4.2.1", "@types/ora": "^3.2.0",
"prettier": "^2.8.1", "@types/pify": "3.0.2",
"ts-node": "^10.9.1", "@types/rimraf": "2.0.2",
"typescript": "^4.9.4", "@types/semver": "^6.0.0",
"vitest": "^0.26.2" "chai": "^4.2.0",
}, "execa": "^1.0.0",
"prettier": { "mocha": "^6.1.4",
"parser": "typescript", "prettier": "^1.18.2",
"semi": false, "ts-node": "^8.3.0",
"singleQuote": true, "tslint": "^5.17.0",
"printWidth": 100 "tslint-config-prettier": "^1.18.0",
}, "tslint-plugin-prettier": "^2.0.1",
"eslintConfig": { "typescript": "^3.5.2"
"parser": "@typescript-eslint/parser",
"plugins": [
"import",
"@typescript-eslint"
],
"extends": [
"eslint:recommended",
"plugin:@typescript-eslint/recommended",
"prettier",
"plugin:prettier/recommended"
],
"rules": {
"@typescript-eslint/consistent-type-imports": [
2,
{
"prefer": "type-imports",
"disallowTypeAnnotations": false
}
],
"import/extensions": [
2,
"ignorePackages"
],
"@typescript-eslint/no-unused-vars": [
2,
{
"args": "after-used",
"ignoreRestSiblings": true,
"argsIgnorePattern": "^_"
}
],
"@typescript-eslint/no-use-before-define": 0,
"@typescript-eslint/no-explicit-any": 0,
"@typescript-eslint/explicit-function-return-type": 0,
"no-warning-comments": 1,
"one-var": [
"error",
"consecutive"
]
}
} }
} }
+118 -85
View File
@@ -1,29 +1,33 @@
import { resolve, normalize, join } from 'node:path' import { delimiter, resolve, normalize, join } from 'path'
import { Buffer } from 'node:buffer' import { Buffer } from 'buffer'
import type { ReadStream } from 'node:fs' import { createReadStream, ReadStream } from 'fs'
import { createReadStream } from 'node:fs' import { spawn } from 'child_process'
import { spawn } from 'node:child_process' import { Logger, LogStep } from './logger'
import {
readFileAsync,
writeFileAsync,
pathExistsAsync,
statAsync,
dequote,
isWindows,
bound,
semverGt
} from './util'
import { NexeOptions, version } from './options'
import { NexeTarget } from './target'
import combineStreams = require('multistream')
import { Bundle, toStream } from './fs/bundle'
import type { File } from 'resolve-dependencies' const isBsd = Boolean(~process.platform.indexOf('bsd'))
import MultiStream from 'multistream' const make = isWindows ? 'vcbuild.bat' : isBsd ? 'gmake' : 'make'
const configure = isWindows ? 'configure' : './configure'
import type { LogStep } from './logger.js'
import { Logger } from './logger.js'
import { readFile, writeFile, pathExists, isWindows, bound, wrap } from './util.js'
import { version } from './options.js'
import type { NexeOptions } from './options.js'
import type { NexeTarget } from './target.js'
import { Bundle, toStream } from './fs/bundle.js'
const isBsd = Boolean(~process.platform.indexOf('bsd')),
make = isWindows ? 'vcbuild.bat' : isBsd ? 'gmake' : 'make'
type StringReplacer = (match: string) => string type StringReplacer = (match: string) => string
export interface NexeFile { export interface NexeFile {
filename: string filename: string
absPath: string absPath: string
contents: string | Buffer contents: string
} }
export { NexeOptions } export { NexeOptions }
@@ -39,7 +43,7 @@ export class NexeCompiler {
/** /**
* Epoch of when compilation started * Epoch of when compilation started
*/ */
private readonly start = Date.now() private start = Date.now()
private compileStep: LogStep | undefined private compileStep: LogStep | undefined
public log = new Logger(this.options.loglevel) public log = new Logger(this.options.loglevel)
/** /**
@@ -65,7 +69,7 @@ export class NexeCompiler {
/** /**
* The last shim (defaults to "require('module').runMain()") * The last shim (defaults to "require('module').runMain()")
*/ */
public startup = '' public startup: string = ''
/** /**
* The main entrypoint filename for your application - eg. node mainFile.js * The main entrypoint filename for your application - eg. node mainFile.js
*/ */
@@ -86,6 +90,10 @@ export class NexeCompiler {
* Flag to indicate whether or notstdin was used for input * Flag to indicate whether or notstdin was used for input
*/ */
public stdinUsed = false public stdinUsed = false
/**
* Path to the configure script
*/
public configureScript: string
/** /**
* The file path of node binary * The file path of node binary
*/ */
@@ -97,44 +105,62 @@ export class NexeCompiler {
constructor(public options: NexeOptions) { constructor(public options: NexeOptions) {
const { python } = (this.options = options) const { python } = (this.options = options)
// SOMEDAY iterate over multiple targets with `--outDir` //SOMEDAY iterate over multiple targets with `--outDir`
this.targets = options.targets as NexeTarget[] this.targets = options.targets as NexeTarget[]
this.target = this.targets[0] this.target = this.targets[0]
if (!/https?:\/\//.test(options.remote)) { if (options.asset && options.asset.startsWith('http')) {
throw new NexeError(`Invalid remote URI scheme (must be http or https): ${options.remote}`) this.remoteAsset = options.asset
} else {
this.remoteAsset =
'https://github.com/nexe/nexe/releases/download/v3.3.3/' + this.target.toString()
} }
this.remoteAsset = options.remote + this.target.toString()
this.src = join(this.options.temp, this.target.version) this.src = join(this.options.temp, this.target.version)
this.configureScript = configure + (semverGt(this.target.version, '10.10.0') ? '.py' : '')
this.nodeSrcBinPath = isWindows this.nodeSrcBinPath = isWindows
? join(this.src, 'Release', 'node.exe') ? join(this.src, 'Release', 'node.exe')
: join(this.src, 'out', 'Release', 'node') : join(this.src, 'out', 'Release', 'node')
this.log.step('nexe ' + version, 'info') this.log.step('nexe ' + version, 'info')
this.bundle = new Bundle(options) this.bundle = new Bundle(options)
if (isWindows) {
this.env = { ...process.env } const originalPath = process.env.PATH
if (python) { delete process.env.PATH
this.env.PYTHON = python this.env = { ...process.env }
this.env.PATH = python
? (this.env.PATH = dequote(normalize(python)) + delimiter + originalPath)
: originalPath
process.env.PATH = originalPath
} else {
this.env = { ...process.env }
python && (this.env.PYTHON = python)
} }
} }
@bound @bound
async addResource(absoluteFileName: string, content?: Buffer | string | File) { addResource(file: string, content?: Buffer | string) {
return await this.bundle.addResource(absoluteFileName, content) return this.bundle.addResource(file, content)
}
get binaryConfiguration() {
return { resources: this.bundle.index }
}
get resourceSize() {
return this.bundle.blobSize
} }
@bound @bound
async readFileAsync(file: string) { async readFileAsync(file: string) {
this.assertBuild() 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) { if (!cachedFile) {
const absPath = join(this.src, file) const absPath = join(this.src, file)
cachedFile = { cachedFile = {
absPath, absPath,
filename: file, filename: file,
contents: await readFile(absPath, 'utf-8').catch((x) => { contents: await readFileAsync(absPath, 'utf-8').catch(x => {
if (x.code === 'ENOENT') return '' if (x.code === 'ENOENT') return ''
throw x throw x
}), })
} }
this.files.push(cachedFile) this.files.push(cachedFile)
} }
@@ -142,38 +168,27 @@ export class NexeCompiler {
} }
@bound @bound
async writeFileAsync(file: string, contents: string | Buffer) { writeFileAsync(file: string, contents: string | Buffer) {
this.assertBuild() this.assertBuild()
return await writeFile(join(this.src, file), contents) return writeFileAsync(join(this.src, file), contents)
} }
@bound @bound
async replaceInFileAsync( async replaceInFileAsync(file: string, replace: string | RegExp, value: string | StringReplacer) {
file: string,
replace: string | RegExp,
value: string | StringReplacer
): Promise<boolean> {
const entry = await this.readFileAsync(file) const entry = await this.readFileAsync(file)
let replaced = false entry.contents = entry.contents.replace(replace, value as any)
const replacer = (match: string) => {
replaced = true
if (typeof value === 'function') return value(match)
return value
}
entry.contents = entry.contents.toString().replace(replace, replacer)
return replaced
} }
@bound @bound
async setFileContentsAsync(file: string, contents: string | Buffer) { async setFileContentsAsync(file: string, contents: string) {
const entry = await this.readFileAsync(file) const entry = await this.readFileAsync(file)
entry.contents = contents entry.contents = contents
} }
async quit(error?: any) { quit(error?: any) {
const time = Date.now() - this.start const time = Date.now() - this.start
this.log.write(`Finished in ${time / 1000}s`, error ? 'red' : 'green') this.log.write(`Finished in ${time / 1000}s`, error ? 'red' : 'green')
return await this.log.flush() return this.log.flush()
} }
assertBuild() { assertBuild() {
@@ -183,7 +198,7 @@ export class NexeCompiler {
} }
public getNodeExecutableLocation(target?: NexeTarget) { public getNodeExecutableLocation(target?: NexeTarget) {
if (this.options.asset) { if (this.options.asset && !this.options.asset.startsWith('http')) {
return resolve(this.options.cwd, this.options.asset) return resolve(this.options.cwd, this.options.asset)
} }
if (target) { if (target) {
@@ -192,25 +207,25 @@ export class NexeCompiler {
return this.nodeSrcBinPath return this.nodeSrcBinPath
} }
private async _runBuildCommandAsync(command: string, args: string[]) { private _runBuildCommandAsync(command: string, args: string[]) {
if (this.log.verbose) { if (this.log.verbose) {
this.compileStep?.pause() this.compileStep!.pause()
} }
return await new Promise<void>((resolve, reject) => { return new Promise((resolve, reject) => {
spawn(command, args, { spawn(command, args, {
cwd: this.src, cwd: this.src,
env: this.env, env: this.env,
stdio: this.log.verbose ? 'inherit' : 'ignore', stdio: this.log.verbose ? 'inherit' : 'ignore'
}) })
.once('error', (e: Error) => { .once('error', (e: Error) => {
if (this.log.verbose) { if (this.log.verbose) {
this.compileStep?.resume() this.compileStep!.resume()
} }
reject(e) reject(e)
}) })
.once('close', (code: number) => { .once('close', (code: number) => {
if (this.log.verbose) { if (this.log.verbose) {
this.compileStep?.resume() this.compileStep!.resume()
} }
if (code != 0) { if (code != 0) {
const error = `${command} ${args.join(' ')} exited with code: ${code}` const error = `${command} ${args.join(' ')} exited with code: ${code}`
@@ -221,66 +236,84 @@ export class NexeCompiler {
}) })
} }
private async _configureAsync() { private _configureAsync() {
if (isWindows) { if (isWindows && semverGt(this.target.version, '10.15.99')) {
return await Promise.resolve() return Promise.resolve()
} }
return await this._runBuildCommandAsync(this.env.PYTHON || 'python3', [ return this._runBuildCommandAsync(this.env.PYTHON || 'python', [
'./configure.py', this.configureScript,
...this.options.configure, ...this.options.configure
]) ])
} }
public async build(): Promise<ReadStream> { public async build(): Promise<ReadStream> {
this.compileStep?.log( this.compileStep!.log(
`Configuring node build${ `Configuring node build${
this.options.configure.length > 0 ? ': ' + this.options.configure : '...' this.options.configure.length ? ': ' + this.options.configure : '...'
}` }`
) )
await this._configureAsync() await this._configureAsync()
const buildOptions = this.options.make const buildOptions = this.options.make
this.compileStep?.log( this.compileStep!.log(
`Compiling Node${buildOptions.length > 0 ? ' with arguments: ' + buildOptions : '...'}` `Compiling Node${buildOptions.length ? ' with arguments: ' + buildOptions : '...'}`
) )
await this._runBuildCommandAsync(make, buildOptions) await this._runBuildCommandAsync(make, buildOptions)
return createReadStream(this.getNodeExecutableLocation()) return createReadStream(this.getNodeExecutableLocation())
} }
async compileAsync(target: NexeTarget) { private async _shouldCompileBinaryAsync(
const step = (this.compileStep = this.log.step('Compiling result')), binary: NodeJS.ReadableStream | null,
build = this.options.build, location: string | undefined
location = this.getNodeExecutableLocation(build ? undefined : target) ) {
let binary = (await pathExists(location)) ? createReadStream(location) : null //SOMEDAY combine make/configure/vcBuild/and modified times of included files
const { snapshot, build } = this.options
if (!binary) { if (!binary) {
return true
}
if (build && snapshot != null && (await pathExistsAsync(snapshot))) {
const snapshotLastModified = (await statAsync(snapshot)).mtimeMs
const binaryLastModified = (await statAsync(location)).mtimeMs
return snapshotLastModified > binaryLastModified
}
return false
}
async compileAsync(target: NexeTarget) {
const step = (this.compileStep = this.log.step('Compiling result'))
const build = this.options.build
const location = this.getNodeExecutableLocation(build ? undefined : target)
let binary = (await pathExistsAsync(location)) ? createReadStream(location) : null
if (await this._shouldCompileBinaryAsync(binary, location)) {
binary = await this.build() binary = await this.build()
step.log('Node binary compiled') step.log('Node binary compiled')
} }
return await this._assembleDeliverable(binary) return this._assembleDeliverable(binary!)
} }
code() { code() {
return [this.shims.join(''), this.startup].join(';') return [this.shims.join(''), this.startup].join(';')
} }
private async _assembleDeliverable(binary: NodeJS.ReadableStream) { private _assembleDeliverable(binary: NodeJS.ReadableStream) {
if (!this.options.mangle) { if (!this.options.mangle) {
return binary return binary
} }
const resources = this.bundle.renderIndex()
this.shims.unshift(wrap(`process.__nexe = ${JSON.stringify({ resources })};\n`))
const code = this.code(), const startup = this.code(),
codeSize = Buffer.byteLength(code), codeSize = Buffer.byteLength(startup)
lengths = Buffer.from(Array(16))
const lengths = Buffer.from(Array(16))
lengths.writeDoubleLE(codeSize, 0) lengths.writeDoubleLE(codeSize, 0)
lengths.writeDoubleLE(this.bundle.size, 8) lengths.writeDoubleLE(this.bundle.blobSize, 8)
return new (MultiStream as any)([ return combineStreams([
binary, binary,
toStream(code), toStream(startup),
this.bundle.toStream(), this.bundle.toStream(),
toStream(Buffer.concat([Buffer.from('<nexe~~sentinel>'), lengths])), toStream(Buffer.concat([Buffer.from('<nexe~~sentinel>'), lengths]))
]) ])
} }
} }
+13 -14
View File
@@ -1,21 +1,20 @@
if (true) { if (true) {
const patches = (process.nexe = { patches: {} }).patches const __nexe_patches = (process.nexe = { patches: {} }).patches
const slice = [].slice
;["ReadFile", "ReadJSON", "Stat"].forEach((x) => { const __nexe_noop_patch = function (original) {
patch(process.binding("fs"), "internalModule" + x, noop) const args = slice.call(arguments, 1)
})
function noop(original, ...args) {
return original.apply(this, args) return original.apply(this, args)
} }
const __nexe_patch = function (obj, method, patch) {
function patch(obj, method, patch) { const original = obj[method]
const original = obj[method];
if (!original) return if (!original) return
patches[method] = patch __nexe_patches[method] = patch
obj[method] = function (...args) { obj[method] = function() {
args.unshift(original) const args = [original].concat(slice.call(arguments))
return patches[method].apply(this, args) return __nexe_patches[method].apply(this, args)
} }
} }
__nexe_patch((process).binding('fs'), 'internalModuleReadFile', __nexe_noop_patch)
__nexe_patch((process).binding('fs'), 'internalModuleReadJSON', __nexe_noop_patch)
__nexe_patch((process).binding('fs'), 'internalModuleStat', __nexe_noop_patch)
} }
+44 -128
View File
@@ -1,154 +1,70 @@
import { lstat, realpath, stat } from 'node:fs/promises' import { stat as getStat, Stats, createReadStream } from 'fs'
import { createReadStream } from 'node:fs' import { relative } from 'path'
import { relative } from 'node:path' import { Readable } from 'stream'
import { Readable } from 'node:stream' import combineStreams = require('multistream')
import type { File } from 'resolve-dependencies' const stat = (file: string): Promise<Stats> => {
import MultiStream from 'multistream' return new Promise((resolve, reject) => {
getStat(file, (err, stats) => (err ? reject(err) : resolve(stats)))
export type MultiStreams = Array<Readable | (() => Readable)> })
}
function makeRelative(cwd: string, path: string) { function makeRelative(cwd: string, path: string) {
return './' + relative(cwd, path) 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) { export function toStream(content: Buffer | string) {
const readable = new Readable({ const readable = new Readable({ read() {} })
read() { readable.push(content)
this.push(content) readable.push(null)
this.push(null)
},
})
return readable return readable
} }
async function createFile(absoluteFileName: string) { export type File = { absPath: string; contents: string; deps: FileMap }
const stats = await lstat(absoluteFileName), export type FileMap = { [absPath: string]: File | null }
file: File = {
size: stats.size, export interface BundleOptions {
moduleType: 'commonjs', entries: string[]
contents: '', cwd: string
absPath: absoluteFileName, expand: boolean
deps: {}, loadContent: boolean
} files: FileMap
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 { 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() }) { constructor({ cwd }: { cwd: string } = { cwd: process.cwd() }) {
this.cwd = cwd this.cwd = cwd
} }
cwd: string
blobSize: number = 0
index: { [relativeFilePath: string]: [number, number] } = {}
streams: (Readable | (() => Readable))[] = []
get list() { async addResource(absoluteFileName: string, content?: Buffer | string) {
return Object.keys(this.files) let length = 0
} if (content !== undefined) {
length = Buffer.byteLength(content)
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),
moduleType: 'commonjs',
contents: content.toString(),
deps: {},
absPath: absoluteFileName,
}
} else if (content) {
this.files[content.absPath] = content
} else { } else {
this.files[absoluteFileName] = { const stats = await stat(absoluteFileName)
absPath: absoluteFileName, length = stats.size
moduleType: 'commonjs',
contents: '',
deps: {},
size: 0,
}
this.files[absoluteFileName] = await createFile(absoluteFileName)
} }
return (this.size += this.files[absoluteFileName].size)
const start = this.blobSize
this.blobSize += length
this.index[makeRelative(this.cwd, absoluteFileName)] = [start, length]
this.streams.push(() => (content ? toStream(content) : createReadStream(absoluteFileName)))
} }
/** concat() {
* De-dupe files by absolute path, partition by symlink/real throw new Error('Not Implemented')
* 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: Array<[string, File]> = [],
symLinks: Array<[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() { toStream() {
return new MultiStream(this.streams) return combineStreams(this.streams)
}
toJSON() {
return this.index
} }
} }
+15
View File
@@ -0,0 +1,15 @@
{
"name": "nexe-fs",
"version": "1.0.1",
"description": "Virtual File System used by nexe",
"main": "bundle.js",
"files": [
"*.d.ts",
"*.js"
],
"author": "Caleb Boyd",
"dependencies": {
"multistream": "^2.1.1"
},
"license": "MIT"
}
+119 -182
View File
@@ -1,7 +1,4 @@
/* eslint-disable prefer-rest-params */ import { Stats } from 'fs'
/* eslint-disable @typescript-eslint/no-var-requires */
import type { Stats } from 'fs'
import type { Func } from '../util'
export interface NexeBinary { export interface NexeBinary {
blobPath: string blobPath: string
@@ -15,13 +12,8 @@ export interface NexeBinary {
} }
} }
let originalFsMethods: any = null, let originalFsMethods: any = null
lazyRestoreFs = () => void 0 let lazyRestoreFs = () => {}
// optional Win32 file namespace prefix followed by drive letter and colon
const windowsFullPathRegex = /^(\\{2}\?\\)?([a-zA-Z]):/,
upcaseDriveLetter = (s: string): string =>
s.replace(windowsFullPathRegex, (_match, ns, drive) => `${ns || ''}${drive.toUpperCase()}:`)
function shimFs(binary: NexeBinary, fs: any = require('fs')) { function shimFs(binary: NexeBinary, fs: any = require('fs')) {
if (originalFsMethods !== null) { if (originalFsMethods !== null) {
@@ -34,102 +26,75 @@ function shimFs(binary: NexeBinary, fs: any = require('fs')) {
notAFile = '!@#$%^&*', notAFile = '!@#$%^&*',
isWin = process.platform.startsWith('win'), isWin = process.platform.startsWith('win'),
isString = (x: any): x is string => typeof x === 'string' || x instanceof String, isString = (x: any): x is string => typeof x === 'string' || x instanceof String,
noop = () => void 0 noop = () => {},
const path = require('path') path = require('path'),
const winPath: (key: string) => string = isWin ? upcaseDriveLetter : (s) => s, baseDir = path.dirname(process.execPath)
baseDir = winPath(path.dirname(process.execPath))
let log = (_: string) => true, let log = (_: string) => true
loggedManifest = false
if ((process.env.DEBUG || '').toLowerCase().includes('nexe:require')) { if ((process.env.DEBUG || '').toLowerCase().includes('nexe:require')) {
log = (text: string) => { log = (text: string) => process.stderr.write('[nexe] - ' + text + '\n')
setupManifest() }
if (!loggedManifest) {
process.stderr.write('[nexe] - MANIFEST' + JSON.stringify(manifest, null, 4) + '\n') const winPath = (key: string) => {
process.stderr.write('[nexe] - DIRECTORIES' + JSON.stringify(directories, null, 4) + '\n') if (isWin && key.substr(1, 2) === ':\\') {
loggedManifest = true key = key[0].toUpperCase() + key.substr(1)
}
return process.stderr.write('[nexe] - ' + text + '\n')
} }
return key
} }
const getKey = function getKey(filepath: string | Buffer | null): string { const getKey = function getKey(filepath: string | Buffer | null): string {
if (Buffer.isBuffer(filepath)) { if (Buffer.isBuffer(filepath)) {
filepath = filepath.toString() filepath = filepath.toString()
}
if (!isString(filepath)) {
return notAFile
}
const key = path.resolve(baseDir, filepath)
return winPath(key)
},
statTime = function () {
return {
atime: new Date(stat.atime),
mtime: new Date(stat.mtime),
ctime: new Date(stat.ctime),
birthtime: new Date(stat.birthtime),
}
} }
if (!isString(filepath)) {
return notAFile
}
let key = path.resolve(baseDir, filepath)
let BigInt: any return winPath(key)
try {
BigInt = eval('BigInt')
} catch (ignored) {
void ignored
} }
const minBlocks = Math.max(Math.ceil(stat.blksize / 512), 1), const statTime = function() {
createStat = function (extensions: any, options: any) { return {
const stat = Object.assign(new fs.Stats(), binary.layout.stat, statTime(), extensions) dev: 0,
if ('size' in extensions) { ino: 0,
// Assume non adjustable allocation size for file system nlink: 0,
stat.blocks = Math.ceil(stat.size / stat.blksize) * minBlocks rdev: 0,
} uid: 123,
if (options && options.bigint && typeof BigInt !== 'undefined') { gid: 500,
for (const k in stat) { blksize: 4096,
if (Object.prototype.hasOwnProperty.call(stat, k) && typeof stat[k] === 'number') { blocks: 0,
stat[k] = BigInt(stat[k]) atime: new Date(stat.atime),
} atimeMs: stat.atime.getTime(),
} mtime: new Date(stat.mtime),
} mtimeMs: stat.mtime.getTime(),
return stat ctime: new Date(stat.ctime),
}, ctimMs: stat.ctime.getTime(),
ownStat = function (filepath: any, options: any) { birthtime: new Date(stat.birthtime),
setupManifest() birthtimeMs: stat.birthtime.getTime()
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 }, options)
}
if (manifest[key]) {
return createStat({ size: manifest[key][1] }, options)
}
},
getStat = function (fn: string) {
return 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)
})
} else {
return originalFsMethods[fn].apply(fs, arguments)
}
}
} }
}
const createStat = function(extensions: any) {
return Object.assign(new fs.Stats(), binary.layout.stat, statTime(), extensions)
}
const ownStat = function(filepath: 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 })
}
if (manifest[key]) {
return createStat({ size: manifest[key][1] })
}
}
function makeLong(filepath: string) { function makeLong(filepath: string) {
return path._makeLong && path._makeLong(filepath) return (path as any)._makeLong && (path as any)._makeLong(filepath)
} }
function fileOpts(options: any) { function fileOpts(options: any) {
@@ -137,11 +102,11 @@ function shimFs(binary: NexeBinary, fs: any = require('fs')) {
} }
let setupManifest = () => { let setupManifest = () => {
Object.keys(manifest).forEach((filepath) => { Object.keys(manifest).forEach(filepath => {
const entry = manifest[filepath], const entry = manifest[filepath]
absolutePath = getKey(filepath), const absolutePath = getKey(filepath)
longPath = makeLong(absolutePath), const longPath = makeLong(absolutePath)
normalizedPath = winPath(path.normalize(filepath)) const normalizedPath = winPath(path.normalize(filepath))
if (!manifest[absolutePath]) { if (!manifest[absolutePath]) {
manifest[absolutePath] = entry manifest[absolutePath] = entry
@@ -153,8 +118,8 @@ function shimFs(binary: NexeBinary, fs: any = require('fs')) {
manifest[normalizedPath] = manifest[filepath] manifest[normalizedPath] = manifest[filepath]
} }
let currentDir = path.dirname(absolutePath), let currentDir = path.dirname(absolutePath)
prevDir = absolutePath let prevDir = absolutePath
while (currentDir !== prevDir) { while (currentDir !== prevDir) {
directories[currentDir] = directories[currentDir] || {} directories[currentDir] = directories[currentDir] || {}
@@ -172,7 +137,7 @@ function shimFs(binary: NexeBinary, fs: any = require('fs')) {
setupManifest = noop setupManifest = noop
} }
// naive patches intended to work for most use cases //naive patches intended to work for most use cases
const nfs: any = { const nfs: any = {
existsSync: function existsSync(filepath: string) { existsSync: function existsSync(filepath: string) {
setupManifest() setupManifest()
@@ -202,7 +167,7 @@ function shimFs(binary: NexeBinary, fs: any = require('fs')) {
setupManifest() setupManifest()
const dir = directories[getKey(filepath)] const dir = directories[getKey(filepath)]
if (dir) { if (dir) {
if (typeof options === 'function') { if ('function' === typeof options) {
callback = options callback = options
options = { encoding: 'utf8' } options = { encoding: 'utf8' }
} }
@@ -211,7 +176,7 @@ function shimFs(binary: NexeBinary, fs: any = require('fs')) {
return originalFsMethods.readdir.apply(fs, arguments) return originalFsMethods.readdir.apply(fs, arguments)
} }
}, },
readdirSync: function readdirSync(filepath: string | Buffer) { readdirSync: function readdirSync(filepath: string | Buffer, options: any) {
setupManifest() setupManifest()
const dir = directories[getKey(filepath)] const dir = directories[getKey(filepath)]
if (dir) { if (dir) {
@@ -226,33 +191,30 @@ function shimFs(binary: NexeBinary, fs: any = require('fs')) {
if (!entry) { if (!entry) {
return originalFsMethods.readFile.apply(fs, arguments) return originalFsMethods.readFile.apply(fs, arguments)
} }
const [offset, length] = entry, const [offset, length] = entry
resourceOffset = resourceStart + offset, const resourceOffset = resourceStart + offset
encoding = fileOpts(options).encoding const encoding = fileOpts(options).encoding
callback = typeof options === 'function' ? options : callback 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) if (err) return callback(err, null)
originalFsMethods.read( originalFsMethods.read(fd, Buffer.alloc(length), 0, length, resourceOffset, function(
fd, error: Error,
Buffer.alloc(length), bytesRead: number,
0, result: Buffer
length, ) {
resourceOffset, if (error) {
function (error: Error, bytesRead: number, result: Buffer) { return originalFsMethods.close(fd, function() {
if (error) { callback(error, null)
return originalFsMethods.close(fd, function () {
callback(error, null)
})
}
originalFsMethods.close(fd, function (err: Error) {
if (err) {
return callback(err, result)
}
callback(err, encoding ? result.toString(encoding) : result)
}) })
} }
) originalFsMethods.close(fd, function(err: Error) {
if (err) {
return callback(err, result)
}
callback(err, encoding ? result.toString(encoding) : result)
})
})
}) })
}, },
createReadStream: function createReadStream(filepath: any, options: any) { createReadStream: function createReadStream(filepath: any, options: any) {
@@ -261,15 +223,15 @@ function shimFs(binary: NexeBinary, fs: any = require('fs')) {
if (!entry) { if (!entry) {
return originalFsMethods.createReadStream.apply(fs, arguments) return originalFsMethods.createReadStream.apply(fs, arguments)
} }
const [offset, length] = entry, const [offset, length] = entry
resourceOffset = resourceStart + offset, const resourceOffset = resourceStart + offset
opts = fileOpts(options) const opts = fileOpts(options)
return originalFsMethods.createReadStream( return originalFsMethods.createReadStream(
blobPath, blobPath,
Object.assign({}, opts, { Object.assign({}, opts, {
start: resourceOffset, start: resourceOffset,
end: resourceOffset + length - 1, end: resourceOffset + length - 1
}) })
) )
}, },
@@ -279,34 +241,36 @@ function shimFs(binary: NexeBinary, fs: any = require('fs')) {
if (!entry) { if (!entry) {
return originalFsMethods.readFileSync.apply(fs, arguments) return originalFsMethods.readFileSync.apply(fs, arguments)
} }
const [offset, length] = entry, const [offset, length] = entry
resourceOffset = resourceStart + offset, const resourceOffset = resourceStart + offset
encoding = fileOpts(options).encoding, const encoding = fileOpts(options).encoding
fd = originalFsMethods.openSync(process.execPath, 'r'), const fd = originalFsMethods.openSync(process.execPath, 'r')
result = Buffer.alloc(length) const result = Buffer.alloc(length)
originalFsMethods.readSync(fd, result, 0, length, resourceOffset) originalFsMethods.readSync(fd, result, 0, length, resourceOffset)
originalFsMethods.closeSync(fd) originalFsMethods.closeSync(fd)
return encoding ? result.toString(encoding) : result return encoding ? result.toString(encoding) : result
}, },
statSync: function statSync(filepath: string | Buffer, options: any) { statSync: function statSync(filepath: string | Buffer) {
const stat = ownStat(filepath, options) const stat = ownStat(filepath)
if (stat) { if (stat) {
return stat return stat
} }
return originalFsMethods.statSync.apply(fs, arguments) return originalFsMethods.statSync.apply(fs, arguments)
}, },
stat: getStat('stat'), stat: function stat(filepath: string | Buffer, callback: any) {
lstat: getStat('lstat'), const stat = ownStat(filepath)
lstatSync: function statSync(filepath: string | Buffer, options: any) {
const stat = ownStat(filepath, options)
if (stat) { if (stat) {
return stat process.nextTick(() => {
callback(null, stat)
})
} else {
return originalFsMethods.stat.apply(fs, arguments)
} }
return originalFsMethods.lstatSync.apply(fs, arguments) }
},
} }
if (typeof fs.exists === 'function') { if (typeof fs.exists === 'function') {
nfs.exists = function (filepath: string, cb: Func) { nfs.exists = function(filepath: string, cb: Function) {
cb = cb || noop cb = cb || noop
const exists = nfs.existsSync(filepath) const exists = nfs.existsSync(filepath)
process.nextTick(() => cb(exists)) process.nextTick(() => cb(exists))
@@ -315,9 +279,9 @@ function shimFs(binary: NexeBinary, fs: any = require('fs')) {
const patches = (process as any).nexe.patches || {} const patches = (process as any).nexe.patches || {}
delete (process as any).nexe delete (process as any).nexe
patches.internalModuleReadFile = function (this: any, original: any, ...args: any[]) { patches.internalModuleReadFile = function(this: any, original: any, ...args: any[]) {
const [filepath] = args
setupManifest() setupManifest()
const filepath = getKey(args[0])
if (manifest[filepath]) { if (manifest[filepath]) {
log('read (hit) ' + filepath) log('read (hit) ' + filepath)
return nfs.readFileSync(filepath, 'utf-8') return nfs.readFileSync(filepath, 'utf-8')
@@ -325,17 +289,10 @@ function shimFs(binary: NexeBinary, fs: any = require('fs')) {
log('read (miss) ' + filepath) log('read (miss) ' + filepath)
return original.call(this, ...args) return original.call(this, ...args)
} }
let returningArray: boolean patches.internalModuleReadJSON = patches.internalModuleReadFile
patches.internalModuleReadJSON = function (this: any, original: any, ...args: any[]) { patches.internalModuleStat = function(this: any, original: any, ...args: any[]) {
if (!returningArray) returningArray = Array.isArray(original.call(this, ''))
const res = patches.internalModuleReadFile.call(this, original, ...args)
return returningArray && !Array.isArray(res)
? [res, /"(main|name|type|exports|imports)"/.test(res)]
: res
}
patches.internalModuleStat = function (this: any, original: any, ...args: any[]) {
setupManifest() setupManifest()
const filepath = getKey(args[0]) const [filepath] = args
if (manifest[filepath]) { if (manifest[filepath]) {
log('stat (hit) ' + filepath + ' ' + 0) log('stat (hit) ' + filepath + ' ' + 0)
return 0 return 0
@@ -356,7 +313,7 @@ function shimFs(binary: NexeBinary, fs: any = require('fs')) {
} }
if (typeof fs.exists === 'function') { if (typeof fs.exists === 'function') {
nfs.exists = function (filepath: string, cb: Func) { nfs.exists = function(filepath: string, cb: Function) {
cb = cb || noop cb = cb || noop
const exists = nfs.existsSync(filepath) const exists = nfs.existsSync(filepath)
if (!exists) { if (!exists) {
@@ -367,7 +324,7 @@ function shimFs(binary: NexeBinary, fs: any = require('fs')) {
} }
if (typeof fs.copyFile === 'function') { if (typeof fs.copyFile === 'function') {
nfs.copyFile = function (filepath: string, dest: string, flags: number, callback: Func) { nfs.copyFile = function(filepath: string, dest: string, flags: number, callback: Function) {
setupManifest() setupManifest()
const entry = manifest[getKey(filepath)] const entry = manifest[getKey(filepath)]
if (!entry) { if (!entry) {
@@ -389,7 +346,7 @@ function shimFs(binary: NexeBinary, fs: any = require('fs')) {
}) })
}) })
} }
nfs.copyFileSync = function (filepath: string, dest: string) { nfs.copyFileSync = function(filepath: string, dest: string) {
setupManifest() setupManifest()
const entry = manifest[getKey(filepath)] const entry = manifest[getKey(filepath)]
if (!entry) { if (!entry) {
@@ -399,33 +356,13 @@ function shimFs(binary: NexeBinary, fs: any = require('fs')) {
} }
} }
if (typeof fs.realpath.native === 'function') {
nfs.realpath.native = function realpathNative(filepath: any, options: any, cb: any): void {
setupManifest()
const key = getKey(filepath)
if (isString(filepath) && (manifest[filepath] || manifest[key])) {
return process.nextTick(() => cb(null, filepath))
}
return originalFsMethods.realpath.native.call(fs, filepath, options, cb)
}
nfs.realpathSync.native = function realpathSyncNative(filepath: any, options: any) {
setupManifest()
const key = getKey(filepath)
if (manifest[key]) {
return filepath
}
return originalFsMethods.realpathSync.native.call(fs, filepath, options)
}
}
Object.assign(fs, nfs) Object.assign(fs, nfs)
lazyRestoreFs = () => { lazyRestoreFs = () => {
Object.keys(nfs).forEach((key) => { Object.keys(nfs).forEach(key => {
fs[key] = originalFsMethods[key] fs[key] = originalFsMethods[key]
}) })
lazyRestoreFs = () => void 0 lazyRestoreFs = () => {}
return void 0
} }
return true return true
} }
+17 -19
View File
@@ -1,45 +1,45 @@
import type { Func } from './util.js' import colors from 'chalk'
import { color, esm } from './util.js' import ora from 'ora'
const frameLength = 120 const frameLength = 120
export interface LogStep { export interface LogStep {
modify: (text: string, color?: string) => void modify(text: string, color?: string): void
log: (text: string, color?: string) => void log(text: string, color?: string): void
pause: () => void pause(): void
resume: () => void resume(): void
} }
export class Logger { export class Logger {
public verbose: boolean public verbose: boolean
private readonly silent: boolean private silent: boolean
private ora: any private ora: any
private readonly modify: Func private modify: Function
public write: (text: string, color?: string) => void public write: (text: string, color?: string) => void
constructor(level: 'verbose' | 'silent' | 'info') { constructor(level: 'verbose' | 'silent' | 'info') {
this.verbose = level === 'verbose' this.verbose = level === 'verbose'
this.silent = level === 'silent' this.silent = level === 'silent'
if (!this.silent) { if (!this.silent) {
this.ora = esm.ora?.default({ this.ora = ora({
text: 'Starting...', text: 'Starting...',
color: 'blue', color: 'blue',
spinner: 'dots', spinner: 'dots'
}) })
this.ora.stop() this.ora.stop()
} }
const noop = () => void 0 const noop = () => {}
this.modify = this.silent ? noop : this._modify.bind(this) this.modify = this.silent ? noop : this._modify.bind(this)
this.write = this.silent ? noop : this._write.bind(this) this.write = this.silent ? noop : this._write.bind(this)
} }
async flush() { flush() {
!this.silent && this.ora.succeed() !this.silent && this.ora.succeed()
return await new Promise((resolve) => setTimeout(resolve, frameLength)) return new Promise(resolve => setTimeout(resolve, frameLength))
} }
_write(update: string, clr = 'green') { _write(update: string, color = 'green') {
this.ora.succeed().text = color(clr, update) this.ora.succeed().text = (colors as any)[color](update)
this.ora.start() this.ora.start()
} }
@@ -48,12 +48,10 @@ export class Logger {
this.ora.color = color this.ora.color = color
} }
step(text: string, method = 'succeed', clr?: string): LogStep { step(text: string, method: string = 'succeed'): LogStep {
if (this.silent) { if (this.silent) {
// eslint-disable-next-line @typescript-eslint/no-empty-function
return { modify() {}, log() {}, pause() {}, resume() {} } return { modify() {}, log() {}, pause() {}, resume() {} }
} }
text = color(clr, text)
if (!this.ora.id) { if (!this.ora.id) {
this.ora.start().text = text this.ora.start().text = text
if (method !== 'succeed') { if (method !== 'succeed') {
@@ -68,7 +66,7 @@ export class Logger {
modify: this.modify, modify: this.modify,
log: this.verbose ? this.write : this.modify, log: this.verbose ? this.write : this.modify,
pause: () => this.ora.stopAndPersist(), pause: () => this.ora.stopAndPersist(),
resume: () => this.ora.start(), resume: () => this.ora.start()
} as LogStep } as LogStep
} }
} }
+27 -33
View File
@@ -1,55 +1,49 @@
import { NexeCompiler } from './compiler.js' import { EOL } from 'os'
import type { NexeOptions, NexePatch } from './options.js' import { compose } from 'app-builder'
import { normalizeOptions } from './options.js' import { NexeCompiler, NexeError } from './compiler'
import { normalizeOptions, NexeOptions, NexePatch } from './options'
import resource from './steps/resource.js' import resource from './steps/resource'
import clean from './steps/clean.js' import clean from './steps/clean'
import cli from './steps/cli.js' import cli from './steps/cli'
import bundle from './steps/bundle.js' import bundle from './steps/bundle'
import download from './steps/download.js' import download from './steps/download'
import shim from './steps/shim.js' import shim from './steps/shim'
import artifacts from './steps/artifacts.js' import artifacts from './steps/artifacts'
import patches from './patches/index.js' import patches from './patches'
import { initEsm } from './util.js'
async function compile( async function compile(
compilerOptions?: Partial<NexeOptions>, compilerOptions?: Partial<NexeOptions>,
callback?: (err: Error | null) => void callback?: (err: Error | null) => void
) { ) {
await initEsm() let error = null,
let error: Error | null = null,
options: NexeOptions | null = null, options: NexeOptions | null = null,
compiler: NexeCompiler | null = null compiler: NexeCompiler | null = null
try { try {
options = normalizeOptions(compilerOptions) options = normalizeOptions(compilerOptions)
compiler = new NexeCompiler(options) compiler = new NexeCompiler(options)
const plugins = options.plugins as NexePatch[], await compose(
buildSteps = options.build ? [artifacts, ...patches, ...(options.patches as NexePatch[])] : [] clean,
await exec([clean, resource, cli, bundle, shim, download, ...buildSteps, ...plugins], compiler) resource,
} catch (e: any) { cli,
bundle,
shim,
download,
options.build ? [artifacts, ...patches, ...(options.patches as NexePatch[])] : [],
options.plugins as NexePatch[]
)(compiler)
} catch (e) {
error = e error = e
} }
if (error) { if (error) {
compiler?.quit(error) compiler && compiler.quit(error)
if (callback) return callback(error) if (callback) return callback(error)
throw error return Promise.reject(error)
} }
if (callback) callback(null) if (callback) callback(null)
} }
export { compile, NexeCompiler } export { compile, NexeCompiler }
export { argv, version, help } from './options.js' export { argv, version, NexeOptions, help } from './options'
export type { NexeOptions } from './options.js'
function exec<T>(mw: any[], ctx: T): Promise<void> | void {
let i = -1
const nxt = (): void | Promise<void> => {
if (++i < mw.length) {
return mw[i](ctx, nxt)
}
}
return nxt()
}
+104 -96
View File
@@ -1,34 +1,26 @@
import { basename, extname, join, isAbsolute, resolve, dirname } from 'node:path' import * as parseArgv from 'minimist'
import { fileURLToPath } from 'node:url' import { NexeCompiler, NexeError } from './compiler'
import { EOL, homedir } from 'node:os' import { isWindows, STDIN_FLAG } from './util'
import { globalAgent } from 'node:https' import { basename, extname, join, isAbsolute, resolve } from 'path'
import { createRequire } from 'node:module' import { getTarget, NexeTarget } from './target'
import { EOL, homedir } from 'os'
const dir = typeof __dirname === 'string' ? __dirname : dirname(fileURLToPath(import.meta.url)), import chalk from 'chalk'
cjs = createRequire(dir)
import { resolveSync } from 'resolve-dependencies' import { resolveSync } from 'resolve-dependencies'
import parseArgv from 'minimist' const caw = require('caw')
const c = process.platform === 'win32' ? chalk.constructor({ enabled: false }) : chalk
import caw from 'caw'
import type { NexeCompiler } from './compiler.js'
import { NexeError } from './compiler.js'
import type { NexeTarget } from './target.js'
import { getTarget } from './target.js'
import { isWindows, STDIN_FLAG, esm } from './util.js'
export const version = '{{replace:0}}' export const version = '{{replace:0}}'
export type NexePatch = (compiler: NexeCompiler, next: () => Promise<void>) => Promise<void> export interface NexePatch {
(compiler: NexeCompiler, next: () => Promise<void>): Promise<void>
}
export interface NexeOptions { export interface NexeOptions {
build: boolean build: boolean
input: string input: string
output: string output: string
targets: Array<string | NexeTarget> targets: (string | NexeTarget)[]
name: string name: string
remote: string
asset: string asset: string
cwd: string cwd: string
fs: boolean | string[] fs: boolean | string[]
@@ -36,12 +28,14 @@ export interface NexeOptions {
configure: string[] configure: string[]
vcBuild: string[] vcBuild: string[]
make: string[] make: string[]
snapshot?: string
resources: string[] resources: string[]
temp: string temp: string
rc: { [key: string]: string }
enableNodeCli: boolean enableNodeCli: boolean
bundle: boolean | string bundle: boolean | string
patches: Array<string | NexePatch> patches: (string | NexePatch)[]
plugins: Array<string | NexePatch> plugins: (string | NexePatch)[]
native: any native: any
mangle: boolean mangle: boolean
ghToken: string ghToken: string
@@ -53,6 +47,7 @@ export interface NexeOptions {
fakeArgv?: boolean fakeArgv?: boolean
verbose?: boolean verbose?: boolean
info?: boolean info?: boolean
ico?: string
debugBundle?: boolean debugBundle?: boolean
warmup?: string warmup?: string
clean?: boolean clean?: boolean
@@ -63,67 +58,65 @@ export interface NexeOptions {
} }
const defaults = { const defaults = {
flags: [], flags: [],
cwd: process.cwd(), cwd: process.cwd(),
fs: true, fs: true,
configure: [], configure: [],
mangle: true, mangle: true,
make: [], make: [],
targets: [], targets: [],
vcBuild: isWindows ? ['nosign', 'release'] : [], vcBuild: isWindows ? ['nosign', 'release'] : [],
enableNodeCli: false, enableNodeCli: false,
build: false, build: false,
bundle: true, bundle: true,
patches: [], patches: [],
plugins: [], plugins: []
remote: 'https://github.com/nexe/nexe/releases/download/v3.3.3/', }
}, const alias = {
alias = { i: 'input',
i: 'input', o: 'output',
o: 'output', v: 'version',
v: 'version', t: 'target',
a: 'asset', b: 'build',
t: 'target', n: 'name',
b: 'build', r: 'resource',
n: 'name', a: 'asset',
r: 'resource', p: 'python',
p: 'python', f: 'flag',
f: 'flag', c: 'configure',
c: 'configure', m: 'make',
m: 'make', h: 'help',
h: 'help', l: 'loglevel',
l: 'loglevel', 'fake-argv': 'fakeArgv',
'fake-argv': 'fakeArgv', 'gh-token': 'ghToken'
'gh-token': 'ghToken', }
}, const argv = parseArgv(process.argv, { alias, default: { ...defaults } })
argv = parseArgv(process.argv, { alias, default: { ...defaults } }), let help = `
help = () => {
const c = esm.chalk?.default as typeof import('chalk').default
return (
EOL +
`
${c.bold('nexe <entry-file> [options]')} ${c.bold('nexe <entry-file> [options]')}
${c.underline.bold('Options:')} ${c.underline.bold('Options:')}
-i --input -- application entry point -i --input -- application entry point
-o --output -- path to output file -o --output -- path to output file
-t --target -- * node version description -t --target -- node version description
-n --name -- main app module name -n --name -- main app module name
-r --resource -- * embed additional files (glob) within the binary -r --resource -- *embed files (glob) within the binary
--remote -- alternate root directory for pre-built base (nexe) binaries from -a --asset -- alternate asset path, file or url pointing to a base (nexe) binary
--plugin -- extend nexe runtime behavior --plugin -- extend nexe runtime behavior
${c.underline.bold('Building from source:')} ${c.underline.bold('Building from source:')}
-b --build -- build from source -b --build -- build from source
-p --python -- python3 executable path -p --python -- python2 (as python) executable path
-f --flag -- * v8 flags to include during compilation -f --flag -- *v8 flags to include during compilation
-c --configure -- * arguments to the configure step -c --configure -- *arguments to the configure step
-m --make -- * arguments to the make/build step -m --make -- *arguments to the make/build step
--patch -- * extend patches applied to source --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.
--sourceUrl -- pass an alternate source tarball (node.tar.gz) url --snapshot -- path to a warmup snapshot
--ico -- file name for alternate icon file (windows)
--rc-* -- populate rc file options (windows)
--sourceUrl -- pass an alternate source (node.tar.gz) url
--enableNodeCli -- enable node cli enforcement (blocks app cli) --enableNodeCli -- enable node cli enforcement (blocks app cli)
${c.underline.bold('Other options:')} ${c.underline.bold('Other options:')}
@@ -136,13 +129,31 @@ ${c.bold('nexe <entry-file> [options]')}
--silent -- disable logging --silent -- disable logging
--verbose -- set logging to verbose --verbose -- set logging to verbose
"*" indicates an option can be used more than once`.trim() + -* variable key name * option can be used more than once`.trim()
EOL help = EOL + help + EOL
)
}
function flatten(...args: any[]): string[] { function flatten(...args: any[]): string[] {
return ([] as string[]).concat(...args).filter((x) => x) return ([] as string[]).concat(...args).filter(x => x)
}
/**
* Extract keys such as { "rc-CompanyName": "Node.js" } to
* { CompanyName: "Node.js" }
* @param {*} match
* @param {*} options
*/
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
)
} }
function extractLogLevel(options: NexeOptions) { function extractLogLevel(options: NexeOptions) {
@@ -158,11 +169,11 @@ function isName(name: string) {
function extractName(options: NexeOptions) { function extractName(options: NexeOptions) {
let name = options.name let name = options.name
// try and use the input filename as the output filename if its not index //try and use the input filename as the output filename if its not index
if (!isName(name) && typeof options.input === 'string') { if (!isName(name) && typeof options.input === 'string') {
name = basename(options.input).replace(extname(options.input), '') name = basename(options.input).replace(extname(options.input), '')
} }
// try and use the directory as the filename //try and use the directory as the filename
if (!isName(name) && basename(options.cwd)) { if (!isName(name) && basename(options.cwd)) {
name = basename(options.cwd) name = basename(options.cwd)
} }
@@ -203,14 +214,14 @@ export function resolveEntry(
const inputPath = padRelative(maybeEntry) const inputPath = padRelative(maybeEntry)
result = resolveSync(cwd, inputPath) result = resolveSync(cwd, inputPath)
} }
if (!process.stdin.isTTY && !result?.absPath && bundle === defaults.bundle) { if (!process.stdin.isTTY && (!result || !result.absPath) && bundle === defaults.bundle) {
return STDIN_FLAG return STDIN_FLAG
} }
if (!result?.absPath) { if (!result || !result.absPath) {
result = resolveSync(cwd, '.') result = resolveSync(cwd, '.')
} }
if (!result.absPath) { if (!result.absPath) {
throw new NexeError(`Entry file "${input || maybeEntry}" not found!`) throw new NexeError(`Entry file "${input || ''}" not found!`)
} }
return result.absPath return result.absPath
} }
@@ -220,9 +231,9 @@ function isCli(options?: Partial<NexeOptions>) {
} }
function normalizeOptions(input?: Partial<NexeOptions>): NexeOptions { function normalizeOptions(input?: Partial<NexeOptions>): NexeOptions {
const options = Object.assign({}, defaults, input) as NexeOptions, const options = Object.assign({}, defaults, input) as NexeOptions
opts = options as any, const opts = options as any
cwd = (options.cwd = resolve(options.cwd)) const cwd = (options.cwd = resolve(options.cwd))
options.temp = options.temp options.temp = options.temp
? resolve(cwd, options.temp) ? resolve(cwd, options.temp)
: process.env.NEXE_TEMP || join(homedir(), '.nexe') : process.env.NEXE_TEMP || join(homedir(), '.nexe')
@@ -233,7 +244,7 @@ function normalizeOptions(input?: Partial<NexeOptions>): NexeOptions {
options.loglevel = extractLogLevel(options) options.loglevel = extractLogLevel(options)
options.flags = flatten(opts.flag, options.flags) options.flags = flatten(opts.flag, options.flags)
options.targets = flatten(opts.target, options.targets).map(getTarget) options.targets = flatten(opts.target, options.targets).map(getTarget)
if (options.targets.length === 0) { if (!options.targets.length) {
options.targets.push(getTarget()) options.targets.push(getTarget())
} }
options.ghToken = options.ghToken || process.env.GITHUB_TOKEN || '' options.ghToken = options.ghToken || process.env.GITHUB_TOKEN || ''
@@ -241,18 +252,15 @@ function normalizeOptions(input?: Partial<NexeOptions>): NexeOptions {
options.configure = flatten(options.configure) options.configure = flatten(options.configure)
options.resources = flatten(opts.resource, options.resources) options.resources = flatten(opts.resource, options.resources)
if (!options.remote.endsWith('/')) {
options.remote += '/'
}
options.downloadOptions = options.downloadOptions || {} options.downloadOptions = options.downloadOptions || {}
options.downloadOptions.headers = options.downloadOptions.headers || {} options.downloadOptions.headers = options.downloadOptions.headers || {}
options.downloadOptions.headers['User-Agent'] = 'nexe (https://www.npmjs.com/package/nexe)' options.downloadOptions.headers['User-Agent'] = 'nexe (https://www.npmjs.com/package/nexe)'
options.downloadOptions.agent = process.env.HTTPS_PROXY options.downloadOptions.agent = process.env.HTTPS_PROXY
? caw(process.env.HTTPS_PROXY, { protocol: 'https' }) ? caw(process.env.HTTPS_PROXY, { protocol: 'https' })
: options.downloadOptions.agent || globalAgent : options.downloadOptions.agent || require('https').globalAgent
options.downloadOptions.rejectUnauthorized = !process.env.NODE_TLS_REJECT_UNAUTHORIZED options.downloadOptions.rejectUnauthorized = process.env.HTTPS_PROXY ? false : true
options.rc = options.rc || extractCliMap(/^rc-.*/, options)
options.output = options.output =
(options.targets[0] as NexeTarget).platform === 'windows' (options.targets[0] as NexeTarget).platform === 'windows'
? `${(options.output || options.name).replace(/\.exe$/, '')}.exe` ? `${(options.output || options.name).replace(/\.exe$/, '')}.exe`
@@ -261,7 +269,7 @@ function normalizeOptions(input?: Partial<NexeOptions>): NexeOptions {
const requireDefault = (x: string) => { const requireDefault = (x: string) => {
if (typeof x === 'string') { if (typeof x === 'string') {
return cjs(x).default return require(x).default
} }
return x return x
} }
@@ -270,7 +278,7 @@ function normalizeOptions(input?: Partial<NexeOptions>): NexeOptions {
options.plugins = flatten(opts.plugin, options.plugins).map(requireDefault) options.plugins = flatten(opts.plugin, options.plugins).map(requireDefault)
options.patches = flatten(opts.patch, options.patches).map(requireDefault) options.patches = flatten(opts.patch, options.patches).map(requireDefault)
if ((!options.mangle && !options.bundle) || options.patches.length > 0) { if ((!options.mangle && !options.bundle) || options.patches.length) {
options.build = true options.build = true
} }
@@ -284,8 +292,8 @@ function normalizeOptions(input?: Partial<NexeOptions>): NexeOptions {
} }
Object.keys(alias) Object.keys(alias)
.filter((k) => k !== 'rc') .filter(k => k !== 'rc')
.forEach((x) => delete opts[x]) .forEach(x => delete opts[x])
return options return options
} }
+11 -13
View File
@@ -1,6 +1,5 @@
/* eslint-disable @typescript-eslint/no-var-requires */ const fs = require('fs'),
const fs = require('fs') fd = fs.openSync(process.execPath, 'r'),
const fd = fs.openSync(process.execPath, 'r'),
stat = fs.statSync(process.execPath), stat = fs.statSync(process.execPath),
tailSize = Math.min(stat.size, 16000), tailSize = Math.min(stat.size, 16000),
tailWindow = Buffer.from(Array(tailSize)) tailWindow = Buffer.from(Array(tailSize))
@@ -9,8 +8,7 @@ fs.readSync(fd, tailWindow, 0, tailSize, stat.size - tailSize)
const footerPosition = tailWindow.indexOf('<nexe~~sentinel>') const footerPosition = tailWindow.indexOf('<nexe~~sentinel>')
if (footerPosition == -1) { if (footerPosition == -1) {
process.stderr.write('\nInvalid Nexe binary\n') throw 'Invalid Nexe binary'
process.exit(1)
} }
const footer = tailWindow.slice(footerPosition, footerPosition + 32), const footer = tailWindow.slice(footerPosition, footerPosition + 32),
@@ -22,13 +20,13 @@ const footer = tailWindow.slice(footerPosition, footerPosition + 32),
Object.defineProperty( Object.defineProperty(
process, process,
'__nexe', '__nexe',
(function () { (function() {
let nexeHeader: any = null let nexeHeader: any = null
return { return {
get: function () { get: function() {
return nexeHeader return nexeHeader
}, },
set: function (value: any) { set: function(value: any) {
if (nexeHeader) { if (nexeHeader) {
throw new Error('This property is readonly') throw new Error('This property is readonly')
} }
@@ -39,19 +37,19 @@ Object.defineProperty(
contentSize, contentSize,
contentStart, contentStart,
resourceSize, resourceSize,
resourceStart, resourceStart
}, }
}) })
Object.freeze(nexeHeader) Object.freeze(nexeHeader)
}, },
enumerable: false, enumerable: false,
configurable: false, configurable: false
} }
})() })()
) )
const contentBuffer = Buffer.from(Array(contentSize)) const contentBuffer = Buffer.from(Array(contentSize)),
const Module = require('module') Module = require('module')
fs.readSync(fd, contentBuffer, 0, contentSize, contentStart) fs.readSync(fd, contentBuffer, 0, contentSize, contentStart)
fs.closeSync(fd) fs.closeSync(fd)
+17
View File
@@ -0,0 +1,17 @@
import { NexeCompiler } from '../compiler'
export default async function buildFixes(compiler: NexeCompiler, next: () => Promise<void>) {
if (!compiler.target.version.startsWith('8.2')) {
return next()
}
const file = await compiler.readFileAsync('./tools/msvs/find_python.cmd')
await compiler.replaceInFileAsync(
'./tools/msvs/find_python.cmd',
'%p%python.exe -V 2>&1',
'"%p%python.exe" -V 2>&1'
)
return next()
}
+35 -11
View File
@@ -1,20 +1,44 @@
import type { NexeCompiler } from '../compiler.js' import { NexeCompiler } from '../compiler'
import { NexeError } from '../compiler.js' import { semverGt } from '../util'
import { semverGt } from '../util.js'
export default async function disableNodeCli(compiler: NexeCompiler, next: () => Promise<void>) { export default async function disableNodeCli(compiler: NexeCompiler, next: () => Promise<void>) {
if (compiler.options.enableNodeCli) { if (compiler.options.enableNodeCli) {
return await next() return next()
} }
const [regex, replacement] = semverGt(compiler.target.version, '18.99') if (semverGt(compiler.target.version, '11.6.0')) {
? [/(?<!int )ProcessGlobalArgsInternal\(argv[^;]*;/gm, 'ExitCode::kNoFailure'] await compiler.replaceInFileAsync(
: [/(?<!int )ProcessGlobalArgs\(argv[^;]*;/gm, 0], 'src/node.cc',
replaced = await compiler.replaceInFileAsync('src/node.cc', regex, `${replacement};/*$&*/`) /(?<!int )ProcessGlobalArgs\(/g,
'0;//ProcessGlobalArgs('
)
} else if (semverGt(compiler.target.version, '10.9')) {
await compiler.replaceInFileAsync('src/node.cc', /(?<!void )ProcessArgv\(/g, '//ProcessArgv(')
} else if (semverGt(compiler.target.version, '9.999')) {
await compiler.replaceInFileAsync(
'src/node.cc',
'int i = 1; i < v8_argc; i++',
'int i = v8_argc; i < v8_argc; i++'
)
let matches = 0
await compiler.replaceInFileAsync('src/node.cc', /v8_argc > 1/g, match => {
if (matches++) {
return 'false'
}
return match
})
} else {
const nodeccMarker = 'argv[index][0] =='
if (!replaced) { await compiler.replaceInFileAsync(
throw new NexeError('There was an error applying the Node CLI patch. Please open an issue.') 'src/node.cc',
`${nodeccMarker} '-'`,
// allow NODE_OPTIONS, introduced in 8.0
semverGt(compiler.target.version, '7.99')
? `(${nodeccMarker} (is_env ? '-' : ']'))`
: `(${nodeccMarker} ']')`
)
} }
return await next() return next()
} }
+5 -10
View File
@@ -1,21 +1,16 @@
import type { NexeCompiler } from '../compiler.js' import { NexeCompiler } from '../compiler'
import { NexeError } from '../compiler.js'
export default async function flags(compiler: NexeCompiler, next: () => Promise<void>) { export default async function flags(compiler: NexeCompiler, next: () => Promise<void>) {
const nodeflags = compiler.options.flags const nodeflags = compiler.options.flags
if (nodeflags.length === 0) { if (!nodeflags.length) {
return await next() return next()
} }
const replaced = await compiler.replaceInFileAsync( await compiler.replaceInFileAsync(
'node.gyp', 'node.gyp',
"'node_v8_options%': ''", "'node_v8_options%': ''",
`'node_v8_options%': '${nodeflags.join(' ')}'` `'node_v8_options%': '${nodeflags.join(' ')}'`
) )
if (!replaced) { return next()
throw new NexeError('Node Flags not applied. Please report an issue')
}
return await next()
} }
+21
View File
@@ -0,0 +1,21 @@
import { NexeCompiler } from '../compiler'
export default async function nodeGyp(
{ files, replaceInFileAsync }: NexeCompiler,
next: () => Promise<void>
) {
await next()
const nodeGypMarker = "'lib/fs.js',"
await replaceInFileAsync(
'node.gyp',
nodeGypMarker,
`
${nodeGypMarker}
${files
.filter(x => x.filename.startsWith('lib'))
.map(x => `'${x.filename}'`)
.toString()},
`.trim()
)
}
+12
View File
@@ -0,0 +1,12 @@
import { normalize } from 'path'
import { readFileAsync } from '../util'
import { NexeCompiler } from '../compiler'
export default async function ico(compiler: NexeCompiler, next: () => Promise<void>) {
const iconFile = compiler.options.ico
if (!iconFile) {
return next()
}
await compiler.setFileContentsAsync('src/res/node.ico', await readFileAsync(normalize(iconFile)))
return next()
}
+9 -4
View File
@@ -1,7 +1,12 @@
import bootNexe from './third-party-main.js' import gyp from './gyp'
import cli from './disable-node-cli.js' import bootNexe from './third-party-main'
import flags from './flags.js' import buildFixes from './build-fixes'
import cli from './disable-node-cli'
import flags from './flags'
import ico from './ico'
import rc from './node-rc'
import snapshot from './snapshot'
const patches = [bootNexe, cli, flags] const patches = [gyp, bootNexe, buildFixes, cli, flags, ico, rc, snapshot]
export default patches export default patches
+27
View File
@@ -0,0 +1,27 @@
import { NexeCompiler } from '../compiler'
export default async function nodeRc(compiler: NexeCompiler, next: () => Promise<void>) {
const options = compiler.options.rc
if (!options) {
return next()
}
const file = await compiler.readFileAsync('src/res/node.rc')
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}`
)
})
;['PRODUCTVERSION', 'FILEVERSION'].forEach(x => {
if (options[x]) {
file.contents = file.contents.replace(new RegExp(x + ' .*$', 'm'), `${x} ${options[x]}`)
}
})
return next()
}
+27
View File
@@ -0,0 +1,27 @@
import { resolve } from 'path'
import { NexeCompiler } from '../compiler'
import { semverGt } from '../util'
export default async function(compiler: NexeCompiler, next: () => Promise<void>) {
const { snapshot, warmup, cwd } = compiler.options
if (!snapshot) {
return next()
}
const variablePrefix = semverGt(compiler.target.version, '11.0.0') ? 'v8_' : ''
await compiler.replaceInFileAsync(
compiler.configureScript,
'def configure_v8(o):',
`def configure_v8(o):\n o['variables']['${variablePrefix}embed_script'] = r'${resolve(
cwd,
snapshot
)}'\n o['variables']['${variablePrefix}warmup_script'] = r'${resolve(
cwd,
warmup || snapshot
)}'`
)
return next()
}
+67 -69
View File
@@ -1,78 +1,14 @@
import { parse } from 'meriyah' import { NexeCompiler } from '../compiler'
import type { NexeCompiler } from '../compiler.js' import { parse } from 'cherow'
import { NexeError } from '../compiler.js' import { wrap, semverGt } from '../util'
import { wrap, semverGt } from '../util.js'
export default async function main(compiler: NexeCompiler, next: () => Promise<void>) { function walkSome(node: any, visit: Function) {
let bootFile = 'lib/internal/bootstrap/pre_execution.js'
if (semverGt(compiler.target.version, '18.11.99')) {
bootFile = 'lib/internal/process/pre_execution.js'
}
const file = await compiler.readFileAsync(bootFile),
ast = parse(file.contents.toString(), {
next: true,
globalReturn: true,
loc: true,
specDeviation: true,
}),
location = { start: { line: 0 } }
walkSome(ast, (node: any) => {
if (!location.start.line && node.type === 'BlockStatement') {
// Find the first block statement and mark the location
Object.assign(location, node.loc)
return true
}
})
const fileLines = file.contents.toString().split('\n')
fileLines.splice(
location.start.line,
0,
'{{replace:lib/MOD/fs/bootstrap.js}}' + '\n' + 'expandArgv1 = false;\n'
)
file.contents = fileLines.join('\n')
const boot = await compiler.replaceInFileAsync(
bootFile,
'initializeFrozenIntrinsics();',
'initializeFrozenIntrinsics();\n' + wrap('{{replace:lib/MOD/patches/boot-nexe.js}}')
),
userModuleAssertion = await compiler.replaceInFileAsync(
bootFile,
'assert(!CJSLoader.hasLoadedAnyUserCJSModule)',
'/*assert(!CJSLoader.hasLoadedAnyUserCJSModule)*/'
),
workerSupport = await compiler.replaceInFileAsync(
'src/node.cc',
'if (env->worker_context() != nullptr) {',
'if (env->worker_context() == nullptr) {\n' +
' return StartExecution(env, "internal/main/run_main_module"); } else {\n'
)
assertPatches({ boot, userModuleAssertion, workerSupport })
return await next()
}
function assertPatches(patches: Record<string, boolean>) {
if (!Object.values(patches).every((x) => x)) {
let message = ''
Object.entries(patches).forEach(([k, v]) => {
if (!v) message += `\nFailed to apply patch for: "${k}". Please open an issue.`
})
throw new NexeError(message.trim())
}
}
function walkSome(node: any, visit: (node: any) => boolean | undefined) {
if (!node || typeof node.type !== 'string' || node._visited) { if (!node || typeof node.type !== 'string' || node._visited) {
return false return false
} }
visit(node) visit(node)
node._visited = true node._visited = true
for (const childNode in node) { for (let childNode in node) {
const child = node[childNode] const child = node[childNode]
if (Array.isArray(child)) { if (Array.isArray(child)) {
for (let i = 0; i < child.length; i++) { for (let i = 0; i < child.length; i++) {
@@ -86,3 +22,65 @@ function walkSome(node: any, visit: (node: any) => boolean | undefined) {
} }
return false return false
} }
export default async function main(compiler: NexeCompiler, next: () => Promise<void>) {
let bootFile = 'lib/internal/bootstrap_node.js'
const { version } = compiler.target
if (version.startsWith('4.')) {
bootFile = 'src/node.js'
} else if (semverGt(version, '11.99')) {
bootFile = 'lib/internal/bootstrap/pre_execution.js'
} else if (semverGt(version, '9.10.1')) {
bootFile = 'lib/internal/bootstrap/node.js'
}
const file = await compiler.readFileAsync(bootFile),
ast = parse(file.contents, {
loc: true,
tolerant: true,
next: true,
globalReturn: true,
node: true,
skipShebang: true
}),
location = { start: { line: 0 } }
walkSome(ast, (node: any) => {
if (!location.start.line && node.type === 'BlockStatement') {
//Find the first block statement and mark the location
Object.assign(location, node.loc)
return true
}
})
const fileLines = file.contents.split('\n')
fileLines.splice(
location.start.line,
0,
'{{replace:lib/fs/bootstrap.js}}' +
'\n' +
(semverGt(version, '11.99') ? 'expandArgv1 = false;\n' : '')
)
file.contents = fileLines.join('\n')
if (semverGt(version, '11.99')) {
await compiler.replaceInFileAsync(
bootFile,
'initializePolicy();',
'initializePolicy();\n' + wrap('{{replace:lib/patches/boot-nexe.js}}')
)
await compiler.replaceInFileAsync(
'src/node.cc',
'MaybeLocal<Value> StartMainThreadExecution(Environment* env) {',
'MaybeLocal<Value> StartMainThreadExecution(Environment* env) {\n' +
' return StartExecution(env, "internal/main/run_main_module");\n'
)
} else {
await compiler.setFileContentsAsync(
'lib/_third_party_main.js',
'{{replace:lib/patches/boot-nexe.js}}'
)
}
return next()
}
+15 -19
View File
@@ -1,7 +1,8 @@
import { platforms, architectures, NexeTarget, getTarget, targetsEqual } from './target.js' import got = require('got')
import { platforms, architectures, NexeTarget, getTarget, targetsEqual } from './target'
export { NexeTarget } export { NexeTarget }
const versionsToSkip = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 11, 13, 15, 17, 19, 21, 22] const versionsToSkip = [0, 1, 2, 3, 4, 5, 7, 9, 11]
export interface GitAsset { export interface GitAsset {
name: string name: string
url: string url: string
@@ -20,30 +21,25 @@ interface NodeRelease {
} }
async function getJson<T>(url: string, options?: any) { async function getJson<T>(url: string, options?: any) {
const { default: got } = await import('got')
return JSON.parse((await got(url, options)).body) as T return JSON.parse((await got(url, options)).body) as T
} }
function isBuildableVersion(version: string) { function isBuildableVersion(version: string) {
if (version === '12.11.0') { const major = Number(version.split('.')[0])
return false return !versionsToSkip.includes(major) || version === '4.8.4'
}
return !versionsToSkip.includes(Number(version.split('.')[0]))
} }
export async function getLatestGitRelease(options?: any) { export function getV3GitRelease(options?: any) {
return await getJson<GitRelease>( return getJson<GitRelease>('https://api.github.com/repos/nexe/nexe/releases/7567580/', options)
'https://api.github.com/repos/nexe/nexe/releases/latest',
options
)
} }
export async function getUnBuiltReleases(options?: any) { export async function getUnBuiltReleases(options?: any) {
const nodeReleases = await getJson<NodeRelease[]>( const nodeReleases = await getJson<NodeRelease[]>(
'https://nodejs.org/download/release/index.json' 'https://nodejs.org/download/release/index.json'
), )
existingVersions = (await getLatestGitRelease(options)).assets.map((x) => getTarget(x.name)), const existingVersions = (await getV3GitRelease(options)).assets.map(x => getTarget(x.name))
versionMap: { [key: string]: true } = {}
const versionMap: { [key: string]: true } = {}
return nodeReleases return nodeReleases
.reduce((versions: NexeTarget[], { version }) => { .reduce((versions: NexeTarget[], { version }) => {
version = version.replace('v', '').trim() version = version.replace('v', '').trim()
@@ -51,8 +47,8 @@ export async function getUnBuiltReleases(options?: any) {
return versions return versions
} }
versionMap[version] = true versionMap[version] = true
platforms.forEach((platform) => { platforms.forEach(platform => {
architectures.forEach((arch) => { architectures.forEach(arch => {
if (arch === 'x86' && platform === 'mac') return if (arch === 'x86' && platform === 'mac') return
if (arch.includes('arm')) return if (arch.includes('arm')) return
versions.push(getTarget({ platform, arch, version })) versions.push(getTarget({ platform, arch, version }))
@@ -60,5 +56,5 @@ export async function getUnBuiltReleases(options?: any) {
}) })
return versions return versions
}, []) }, [])
.filter((x) => !existingVersions.some((t) => targetsEqual(t, x))) .filter(x => !existingVersions.some(t => targetsEqual(t, x)))
} }
+32 -25
View File
@@ -1,22 +1,29 @@
import { join, dirname } from 'node:path' import { join, dirname } from 'path'
import { unlink, readdir, mkdir } from 'node:fs/promises' import { readdir, unlink } from 'fs'
import { readFileAsync, writeFileAsync, isDirectoryAsync } from '../util'
import * as mkdirp from 'mkdirp'
import { NexeCompiler } from '../compiler'
import pify = require('pify')
import { readFile, writeFile, isDirectory } from '../util.js' const mkdirpAsync = pify(mkdirp)
import type { NexeCompiler } from '../compiler.js' const unlinkAsync = pify(unlink)
const readdirAsync = pify(readdir)
async function readDirAsync(dir: string): Promise<string[]> { function readDirAsync(dir: string): Promise<string[]> {
return await readdir(dir).then(async (paths) => { return readdirAsync(dir).then(paths => {
return await Promise.all( return Promise.all(
paths.map(async (file: string) => { paths.map((file: string) => {
const path = join(dir, file) const path = join(dir, file)
return await isDirectory(path).then((x) => (x ? readDirAsync(path) : (path as any))) return isDirectoryAsync(path).then(x => (x ? readDirAsync(path) : (path as any)))
}) })
).then((result) => result.flat()) ).then(result => {
return [].concat(...(result as any))
})
}) })
} }
async function maybeReadFileContentsAsync(file: string) { function maybeReadFileContentsAsync(file: string) {
return await readFile(file, 'utf-8').catch((e) => { return readFileAsync(file, 'utf-8').catch(e => {
if (e.code === 'ENOENT') { if (e.code === 'ENOENT') {
return '' return ''
} }
@@ -34,28 +41,28 @@ async function maybeReadFileContentsAsync(file: string) {
* - Finally, The patched files are written into source. * - Finally, The patched files are written into source.
*/ */
export default async function artifacts(compiler: NexeCompiler, next: () => Promise<void>) { export default async function artifacts(compiler: NexeCompiler, next: () => Promise<void>) {
const { src } = compiler, const { src } = compiler
temp = join(src, 'nexe') const temp = join(src, 'nexe')
await mkdir(temp, { recursive: true }) await mkdirpAsync(temp)
const tmpFiles = await readDirAsync(temp) const tmpFiles = await readDirAsync(temp)
await Promise.all( await Promise.all(
tmpFiles.map(async (path) => { tmpFiles.map(async path => {
return await compiler.writeFileAsync(path.replace(temp, ''), await readFile(path, 'utf-8')) return compiler.writeFileAsync(path.replace(temp, ''), await readFileAsync(path, 'utf-8'))
}) })
) )
await next() await next()
await Promise.all(tmpFiles.map(async (x) => await unlink(x))) await Promise.all(tmpFiles.map(x => unlinkAsync(x)))
return await Promise.all( return Promise.all(
compiler.files.map(async (file) => { compiler.files.map(async file => {
const sourceFile = join(src, file.filename), const sourceFile = join(src, file.filename)
tempFile = join(temp, file.filename), const tempFile = join(temp, file.filename)
fileContents = await maybeReadFileContentsAsync(sourceFile) const fileContents = await maybeReadFileContentsAsync(sourceFile)
await mkdir(dirname(tempFile), { recursive: true }) await mkdirpAsync(dirname(tempFile))
await writeFile(tempFile, fileContents) await writeFileAsync(tempFile, fileContents)
await compiler.writeFileAsync(file.filename, file.contents) await compiler.writeFileAsync(file.filename, file.contents)
}) })
) )
+24 -27
View File
@@ -1,14 +1,13 @@
import { resolve, relative } from 'node:path' import { NexeCompiler, NexeError } from '../compiler'
import type { Readable } from 'node:stream' import { resolve, relative } from 'path'
import { each } from '@calebboyd/semaphore'
import resolveFiles, { resolveSync } from 'resolve-dependencies' import resolveFiles, { resolveSync } from 'resolve-dependencies'
import { dequote, STDIN_FLAG, semverGt } from '../util'
import { Readable } from 'stream'
import type { NexeCompiler } from '../compiler.js' function getStdIn(stdin: Readable): Promise<string> {
import { NexeError } from '../compiler.js'
import { dequote, STDIN_FLAG } from '../util.js'
async function getStdIn(stdin: Readable): Promise<string> {
let out = '' let out = ''
return await new Promise((resolve) => { return new Promise(resolve => {
stdin stdin
.setEncoding('utf8') .setEncoding('utf8')
.on('readable', () => { .on('readable', () => {
@@ -27,20 +26,24 @@ async function getStdIn(stdin: Readable): Promise<string> {
} }
export default async function bundle(compiler: NexeCompiler, next: any) { export default async function bundle(compiler: NexeCompiler, next: any) {
const { bundle: doBundle, cwd, input: inputPath } = compiler.options const { bundle, cwd, input: inputPath } = compiler.options
let input = inputPath let input = inputPath
compiler.entrypoint = './' + relative(cwd, input) compiler.entrypoint = './' + relative(cwd, input)
compiler.startup = ''
if (!doBundle) { if (semverGt(compiler.target.version, '11.99')) {
compiler.startup = ''
} else {
compiler.startup = ';require("module").runMain();'
}
if (!bundle) {
await compiler.addResource(resolve(cwd, input)) await compiler.addResource(resolve(cwd, input))
return next() return next()
} }
let code = '' let code = ''
if (typeof doBundle === 'string') { if (typeof bundle === 'string') {
// eslint-disable-next-line @typescript-eslint/no-var-requires code = await require(bundle).createBundle(compiler.options)
code = await require(doBundle).createBundle(compiler.options)
} }
if (input === STDIN_FLAG && (code = code || dequote(await getStdIn(process.stdin)))) { if (input === STDIN_FLAG && (code = code || dequote(await getStdIn(process.stdin)))) {
@@ -59,26 +62,20 @@ export default async function bundle(compiler: NexeCompiler, next: any) {
compiler.entrypoint = './' + relative(cwd, input) compiler.entrypoint = './' + relative(cwd, input)
} }
const { files, warnings } = resolveFiles( const { files, warnings } = await resolveFiles(
input, input,
...Object.keys(compiler.bundle.list).filter((x) => x.endsWith('.js')), ...Object.keys(compiler.bundle.index).filter(x => x.endsWith('.js')),
{ cwd, expand: 'variable', loadContent: false } { cwd, expand: 'all', loadContent: false }
) )
if ( if (
warnings.filter((x) => x.startsWith('Error parsing file') && !x.includes('node_modules')) warnings.filter(x => x.startsWith('Error parsing file') && !x.includes('node_modules')).length
.length > 0
) { ) {
throw new NexeError('Parsing Error:\n' + warnings.join('\n')) throw new NexeError('Parsing Error:\n' + warnings.join('\n'))
} }
warnings.forEach((x: string) => compiler.log.step('[WARNING]: ' + x, 'stopAndPersist', 'yellow')) await each(Object.keys(files), (filename: string) => compiler.addResource(filename), {
concurrency: 10
await Promise.all( })
Object.entries(files).map(async ([key, file]) => {
return await compiler.addResource(key, file)
})
)
return next() return next()
} }
+6 -7
View File
@@ -1,7 +1,6 @@
import { rm } from 'node:fs/promises' import { NexeCompiler } from '../compiler'
import { rimrafAsync } from '../util'
import type { NexeCompiler } from '../compiler.js' import { NexeTarget } from '../target'
import type { NexeTarget } from '../target.js'
export default async function clean(compiler: NexeCompiler, next: () => Promise<any>) { export default async function clean(compiler: NexeCompiler, next: () => Promise<any>) {
const { options } = compiler const { options } = compiler
@@ -12,9 +11,9 @@ export default async function clean(compiler: NexeCompiler, next: () => Promise<
} }
const step = compiler.log.step('Cleaning up nexe build artifacts...') const step = compiler.log.step('Cleaning up nexe build artifacts...')
step.log(`Deleting contents at: ${path}`) step.log(`Deleting contents at: ${path}`)
await rm(path, { recursive: true, force: true }) await rimrafAsync(path)
step.log(`Deleted contents at: ${path}`) step.log(`Deleted contents at: ${path}`)
return await compiler.quit() return compiler.quit()
} }
return await next() return next()
} }
+9 -8
View File
@@ -1,8 +1,9 @@
import { dirname, normalize, relative, resolve } from 'node:path' import { dirname, normalize, relative, resolve } from 'path'
import { createWriteStream, chmodSync, statSync, mkdirSync } from 'node:fs' import { createWriteStream, chmodSync, statSync } from 'fs'
import type { NexeCompiler } from '../compiler.js' import { NexeCompiler } from '../compiler'
import type { NexeTarget } from '../target.js' import { NexeTarget } from '../target'
import { STDIN_FLAG } from '../util.js' import { STDIN_FLAG } from '../util'
import mkdirp = require('mkdirp')
/** /**
* The "cli" step detects the appropriate input. If no input options are passed, * The "cli" step detects the appropriate input. If no input options are passed,
@@ -19,11 +20,11 @@ export default async function cli(compiler: NexeCompiler, next: () => Promise<vo
const { log } = compiler, const { log } = compiler,
target = compiler.options.targets.shift() as NexeTarget, target = compiler.options.targets.shift() as NexeTarget,
deliverable = await compiler.compileAsync(target), deliverable = await compiler.compileAsync(target),
output = normalize(compiler.output) output = normalize(compiler.output!)
mkdirSync(dirname(output), { recursive: true }) mkdirp.sync(dirname(output))
return await new Promise((res, rej) => { return new Promise((res, rej) => {
const step = log.step('Writing result to file') const step = log.step('Writing result to file')
deliverable deliverable
.pipe(createWriteStream(output)) .pipe(createWriteStream(output))
+16 -20
View File
@@ -1,21 +1,17 @@
import { dirname } from 'node:path' import download = require('download')
import { pathExistsAsync } from '../util'
import download from 'download' import { LogStep } from '../logger'
import { IncomingMessage } from 'http'
import { pathExists } from '../util.js' import { NexeCompiler, NexeError } from '../compiler'
import type { LogStep } from '../logger.js' import { dirname } from 'path'
import type { NexeCompiler } from '../compiler.js'
import { NexeError } from '../compiler.js'
import type { IncomingMessage } from 'node:http'
function fetchNodeSourceAsync(dest: string, url: string, step: LogStep, options = {}) { function fetchNodeSourceAsync(dest: string, url: string, step: LogStep, options = {}) {
const setText = (p: number) => step.modify(`Downloading Node: ${p.toFixed()}%...`) const setText = (p: number) => step.modify(`Downloading Node: ${p.toFixed()}%...`)
return download(url, dest, Object.assign(options, { extract: true, strip: 1 })) return download(url, dest, Object.assign(options, { extract: true, strip: 1 }))
.on('response', (res: IncomingMessage) => { .on('response', (res: IncomingMessage) => {
const total = Number(res.headers['content-length']) const total = +res.headers['content-length']!
let current = 0 let current = 0
res.on('data', (data) => { res.on('data', data => {
current += data.length current += data.length
setText((current / total) * 100) setText((current / total) * 100)
if (current === total) { if (current === total) {
@@ -34,15 +30,15 @@ async function fetchPrebuiltBinary(compiler: NexeCompiler, step: any) {
await download(remoteAsset, dirname(filename), compiler.options.downloadOptions).on( await download(remoteAsset, dirname(filename), compiler.options.downloadOptions).on(
'response', 'response',
(res: IncomingMessage) => { (res: IncomingMessage) => {
const total = Number(res.headers['content-length']) const total = +res.headers['content-length']!
let current = 0 let current = 0
res.on('data', (data) => { res.on('data', data => {
current += data.length current += data.length
step?.modify(`Downloading...${((current / total) * 100).toFixed()}%`) step!.modify(`Downloading...${((current / total) * 100).toFixed()}%`)
}) })
} }
) )
} catch (e: any) { } catch (e) {
if (e.statusCode === 404) { if (e.statusCode === 404) {
throw new NexeError(`${remoteAsset} is not available, create it using the --build flag`) throw new NexeError(`${remoteAsset} is not available, create it using the --build flag`)
} else { } else {
@@ -62,14 +58,14 @@ export default async function downloadNode(compiler: NexeCompiler, next: () => P
{ sourceUrl, downloadOptions, build } = compiler.options, { sourceUrl, downloadOptions, build } = compiler.options,
url = sourceUrl || `https://nodejs.org/dist/v${version}/node-v${version}.tar.gz`, url = sourceUrl || `https://nodejs.org/dist/v${version}/node-v${version}.tar.gz`,
step = log.step( step = log.step(
`Downloading ${build ? '' : 'pre-built '}Node.js${build ? ` source from: ${url}` : ''}` `Downloading ${build ? '' : 'pre-built '}Node.js${build ? `source from: ${url}` : ''}`
), ),
exeLocation = compiler.getNodeExecutableLocation(build ? undefined : target), exeLocation = compiler.getNodeExecutableLocation(build ? undefined : target),
downloadExists = await pathExists(build ? src : exeLocation) downloadExists = await pathExistsAsync(build ? src : exeLocation)
if (downloadExists) { if (downloadExists) {
step.log('Already downloaded...') step.log('Already downloaded...')
return await next() return next()
} }
if (build) { if (build) {
@@ -78,5 +74,5 @@ export default async function downloadNode(compiler: NexeCompiler, next: () => P
await fetchPrebuiltBinary(compiler, step) await fetchPrebuiltBinary(compiler, step)
} }
return await next() return next()
} }
+14 -26
View File
@@ -1,34 +1,22 @@
import { relative } from 'node:path' import { isDirectoryAsync, each } from '../util'
import globs from 'globby'
import fg from 'fast-glob' import { NexeCompiler } from '../compiler'
import { each } from '../util.js'
import type { NexeCompiler } from '../compiler.js'
export default async function resource(compiler: NexeCompiler, next: () => Promise<any>) { export default async function resource(compiler: NexeCompiler, next: () => Promise<any>) {
const { cwd, resources } = compiler.options const { cwd } = compiler.options
if (resources.length === 0) { if (!compiler.options.resources.length) {
return await next() return next()
} }
let count = 0
resources.forEach((x: string) => {
if (x.includes('node_modules/**')) {
compiler.log.step(
`[WARNING]: pattern "${x}" will include many files, consider narrowing the pattern`,
'stopAndPersist',
'yellow'
)
}
})
const step = compiler.log.step('Bundling Resources...') const step = compiler.log.step('Bundling Resources...')
let count = 0
await each(fg(resources, { cwd, absolute: true, onlyFiles: true }), async (file) => { await each(globs(compiler.options.resources, { cwd }), async file => {
if (await isDirectoryAsync(file)) {
return
}
count++ count++
step.log(`Including file: ${relative(cwd, file)}`) step.log(`Including file: ${file}`)
await compiler.addResource(file) await compiler.addResource(file)
}) })
compiler.log.step(`Included ${count} file(s)`, 'stopAndPersist') step.log(`Included ${count} file(s). ${(compiler.resourceSize / 1e6).toFixed(3)} MB`)
return await next() return next()
} }
+8 -6
View File
@@ -1,14 +1,14 @@
import type { NexeCompiler } from '../compiler.js' import { NexeCompiler } from '../compiler'
import { wrap } from '../util.js' import { wrap } from '../util'
export default async function (compiler: NexeCompiler, next: () => Promise<void>) { export default function(compiler: NexeCompiler, next: () => Promise<void>) {
await next()
compiler.shims.push( compiler.shims.push(
wrap( wrap(
'' + `process.__nexe = ${JSON.stringify(compiler.binaryConfiguration)};\n` +
'{{replace:lib/MOD/fs/patch.js}}' + '{{replace:lib/fs/patch.js}}' +
'\nshimFs(process.__nexe)' + '\nshimFs(process.__nexe)' +
`\n${compiler.options.fs ? '' : 'restoreFs()'}` `\n${compiler.options.fs ? '' : 'restoreFs()'}`
//TODO support only restoring specific methods
) )
) )
compiler.shims.push( compiler.shims.push(
@@ -32,4 +32,6 @@ export default async function (compiler: NexeCompiler, next: () => Promise<void>
} }
`) `)
) )
return next()
} }
+27 -27
View File
@@ -1,8 +1,8 @@
export type NodePlatform = 'windows' | 'mac' | 'alpine' | 'linux' export type NodePlatform = 'windows' | 'mac' | 'alpine' | 'linux'
export type NodeArch = 'x86' | 'x64' | 'arm' | 'arm64' export type NodeArch = 'x86' | 'x64' | 'arm7l' | 'arm6l' | 'arm64'
const platforms: NodePlatform[] = ['windows', 'mac', 'alpine', 'linux'], const platforms: NodePlatform[] = ['windows', 'mac', 'alpine', 'linux'],
architectures: NodeArch[] = ['x86', 'x64', 'arm', 'arm64'] architectures: NodeArch[] = ['x86', 'x64', 'arm7l', 'arm6l', 'arm64']
export { platforms, architectures } export { platforms, architectures }
@@ -13,29 +13,30 @@ export interface NexeTarget {
} }
const prettyPlatform: { [key: string]: NodePlatform } = { const prettyPlatform: { [key: string]: NodePlatform } = {
win32: 'windows', win32: 'windows',
windows: 'windows', windows: 'windows',
win: 'windows', win: 'windows',
darwin: 'mac', darwin: 'mac',
macos: 'mac', macos: 'mac',
mac: 'mac', mac: 'mac',
linux: 'linux', linux: 'linux',
static: 'alpine', static: 'alpine',
alpine: 'alpine', alpine: 'alpine'
}, }
prettyArch: { [key: string]: NodeArch } = {
x86: 'x86', const prettyArch: { [key: string]: NodeArch } = {
arm6: 'arm', x86: 'x86',
arm64: 'arm64', arm6: 'arm6l',
arm6l: 'arm', arm64: 'arm64',
arm: 'arm', arm6l: 'arm6l',
arm7: 'arm', arm: 'arm7l',
arm7l: 'arm', arm7: 'arm7l',
amd64: 'x64', arm7l: 'arm7l',
ia32: 'x86', amd64: 'x64',
x32: 'x86', ia32: 'x86',
x64: 'x64', x32: 'x86',
} x64: 'x64'
}
function isVersion(x: string) { function isVersion(x: string) {
if (!x) { if (!x) {
@@ -57,7 +58,6 @@ class Target implements NexeTarget {
toJSON() { toJSON() {
return this.toString() return this.toString()
} }
toString() { toString() {
return `${this.platform}-${this.arch}-${this.version}` return `${this.platform}-${this.arch}-${this.version}`
} }
@@ -80,7 +80,7 @@ export function getTarget(target: string | Partial<NexeTarget> = ''): NexeTarget
target target
.toLowerCase() .toLowerCase()
.split('-') .split('-')
.forEach((x) => { .forEach(x => {
if (isVersion(x)) { if (isVersion(x)) {
version = x.replace(/v/g, '') version = x.replace(/v/g, '')
} }
+1 -4
View File
@@ -6,11 +6,8 @@ declare module 'got' {
const got: GotFn const got: GotFn
export = got export = got
} }
declare module 'caw'
declare module 'download' { declare module 'download' {
import type { Duplex } from 'stream' import { Duplex } from 'stream'
interface DownloadOptions { interface DownloadOptions {
extract?: boolean extract?: boolean
strip?: number strip?: number
+36 -53
View File
@@ -1,40 +1,17 @@
import { readFile, writeFile, stat } from 'node:fs/promises' import { readFile, writeFile, stat } from 'fs'
import { execFile as exec } from 'node:child_process' import { execFile } from 'child_process'
import { promisify } from 'node:util' import pify = require('pify')
import rimraf = require('rimraf')
const rimrafAsync = pify(rimraf)
export const STDIN_FLAG = '[stdin]' export const STDIN_FLAG = '[stdin]'
export const esm: {
chalk: typeof import('chalk') | null
ora: typeof import('ora') | null
got: typeof import('got') | null
} = {
got: null,
chalk: null,
ora: null,
}
export async function initEsm() {
await Promise.all(
(['chalk', 'got', 'ora'] as const).map(async (x) => {
esm[x] = await import(x)
})
)
}
const id = (x: any) => x
export function color(color?: string, text?: string) {
return !color ? text : ((esm.chalk?.default as any)[color] || id)(text)
}
export type Func<T = any, Args = any> = (...args: Args[]) => T
export async function each<T>( export async function each<T>(
list: T[] | Promise<T[]>, list: T[] | Promise<T[]>,
action: (item: T, index: number, list: T[]) => Promise<any> action: (item: T, index: number, list: T[]) => Promise<any>
) { ) {
const l = await list const l = await list
return await Promise.all(l.map(action)) return Promise.all(l.map(action))
} }
export function wrap(code: string) { export function wrap(code: string) {
@@ -49,12 +26,12 @@ function falseOnEnoent(e: any) {
} }
function padRight(str: string, l: number) { function padRight(str: string, l: number) {
return (str + ' '.repeat(l)).slice(0, l) return (str + ' '.repeat(l)).substr(0, l)
} }
const bound: MethodDecorator = function bound<T>( const bound: MethodDecorator = function bound<T>(
target: object, target: Object,
propertyKey: string | symbol, propertyKey: string | Symbol,
descriptor: TypedPropertyDescriptor<T> descriptor: TypedPropertyDescriptor<T>
) { ) {
const configurable = true const configurable = true
@@ -65,17 +42,17 @@ const bound: MethodDecorator = function bound<T>(
Object.defineProperty(this, propertyKey as string, { Object.defineProperty(this, propertyKey as string, {
configurable, configurable,
value, value,
writable: true, writable: true
}) })
return value return value
}, }
} }
} }
function dequote(input: string) { function dequote(input: string) {
input = input.trim() input = input.trim()
const singleQuote = input.startsWith("'") && input.endsWith("'"), const singleQuote = input.startsWith("'") && input.endsWith("'")
doubleQuote = input.startsWith('"') && input.endsWith('"') const doubleQuote = input.startsWith('"') && input.endsWith('"')
if (singleQuote || doubleQuote) { if (singleQuote || doubleQuote) {
return input.slice(1).slice(0, -1) return input.slice(1).slice(0, -1)
} }
@@ -87,25 +64,30 @@ export interface ReadFileAsync {
(path: string, encoding: string): Promise<string> (path: string, encoding: string): Promise<string>
} }
const execFile = promisify(exec), const readFileAsync = pify(readFile)
isWindows = process.platform === 'win32' const writeFileAsync = pify(writeFile)
const statAsync = pify(stat)
const execFileAsync = pify(execFile)
const isWindows = process.platform === 'win32'
async function pathExists(path: string) { function pathExistsAsync(path: string) {
return await stat(path) return statAsync(path)
.then(() => true) .then(x => true)
.catch(falseOnEnoent) .catch(falseOnEnoent)
} }
async function isDirectory(path: string) { function isDirectoryAsync(path: string) {
return await stat(path) return statAsync(path)
.then((x) => x.isDirectory()) .then(x => x.isDirectory())
.catch(falseOnEnoent) .catch(falseOnEnoent)
} }
/**
* @param version See if this version is greather than the second one
* @param operand Version to compare against
*/
function semverGt(version: string, operand: string) { function semverGt(version: string, operand: string) {
const [cMajor, cMinor, cPatch] = version.split('.').map(Number) const [cMajor, cMinor, cPatch] = version.split('.').map(Number)
let [major, minor, patch] = operand.split('.').map(Number) let [major, minor, patch] = operand.split('.').map(Number)
major = Number(major)
if (!minor) minor = 0 if (!minor) minor = 0
if (!patch) patch = 0 if (!patch) patch = 0
return ( return (
@@ -118,13 +100,14 @@ function semverGt(version: string, operand: string) {
export { export {
dequote, dequote,
padRight, padRight,
semverGt,
bound, bound,
isWindows, isWindows,
stat, rimrafAsync,
execFile, statAsync,
readFile, execFileAsync,
pathExists, readFileAsync,
isDirectory, pathExistsAsync,
writeFile, isDirectoryAsync,
semverGt, writeFileAsync
} }
+97 -46
View File
@@ -1,43 +1,104 @@
import { env } from 'node:process' import * as nexe from '../lib/nexe'
import { execSync } from 'node:child_process' import { getUnBuiltReleases, getV3GitRelease } from '../lib/releases'
import { buildArm, buildAlpine } from './docker.js' import { runDockerBuild } from './docker'
import { getTarget, targetsEqual, NexeTarget } from '../lib/target'
import { pathExistsAsync, readFileAsync, execFileAsync, semverGt } from '../lib/util'
import got = require('got')
import { cpus } from 'os'
export async function build(target = env.NEXE_TARGET || null) { const env = process.env,
if (!target?.trim()) { isPullRequest = env.BUILD_REASON === 'PullRequest',
throw new Error('Environment variable NEXE_TARGET not found. Received: ' + target) isWindows = process.platform === 'win32',
isLinux = process.platform === 'linux',
buildHost = env.AGENT_JOBNAME || (isWindows && 'windows_2017_2015') || '',
isMac = process.platform === 'darwin',
headers = {
Authorization: 'token ' + env.GITHUB_TOKEN,
'User-Agent': 'nexe (https://www.npmjs.com/package/nexe)'
} }
const done = keepalive() if (require.main === module) {
let file = '' if (!isPullRequest) {
try { build().catch(x => {
if (target.includes('alpine')) { console.error(x)
file = await buildAlpine(target) process.exit(1)
} else if (target.includes('arm')) { })
file = await buildArm(target) }
} else { }
file = await nexeBuild(target)
assertNexeBinary(file) async function build() {
const releases = await getUnBuiltReleases({ headers })
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')
let target: NexeTarget | undefined
if (env.NEXE_VERSION) target = getTarget(env.NEXE_VERSION)
else if (isWindows) target = windowsBuild
else if (isMac) target = macBuild
else if (isLinux) target = linux
if (buildHost.includes('alpine')) target = alpine
if (!target) {
return console.log('Nothing to build...')
}
if (isWindows && buildHost.includes('2017') && !semverGt(target.version, '9.99.99')) {
return console.log(`Not building ${target} on this host...`)
}
if (isWindows && buildHost.includes('2015') && semverGt(target.version, '9.99.99')) {
return console.log(`Not building ${target} on this host...`)
}
const output = isWindows ? './out.exe' : './out',
options = {
mangle: false,
build: true,
verbose: Boolean(env.NEXE_VERBOSE!),
target,
make: ['-j' + cpus().length],
output
} }
} catch (e: any) { console.log('Building: ' + target + ' on ' + buildHost)
done() const stop = keepalive()
throw e
if (
[/*'arm7l', 'arm6l', 'arm64', */ 'alpine'].includes(target.platform) &&
buildHost.includes('alpine')
) {
await runDockerBuild(target)
} else {
await nexe.compile(options)
} }
stop()
if (!file) { if (await pathExistsAsync(output)) {
throw new Error('Binary failed to build') await assertNexeBinary(output)
const gitRelease = await getV3GitRelease({ headers }),
unbuiltReleases = await getUnBuiltReleases({ headers })
if (!unbuiltReleases.some(x => targetsEqual(x, target!))) {
console.log(`${target} already uploaded.`)
process.exit(0)
return
}
await got(gitRelease.upload_url.split('{')[0], {
query: { name: target.toString() },
body: await readFileAsync(output),
headers: {
...headers,
'Content-Type': 'application/octet-stream'
}
}).catch(reason => {
console.log(reason && reason.response && reason.response.body)
throw reason
})
console.log(target + ' uploaded.')
process.exit(0)
} }
uploadBinary(target, file)
}
function nexeBuild(target: string) {
console.log('building: ' + target)
return Promise.resolve('')
}
function uploadBinary(target: string, file: string) {
void file
console.log('uploading to release')
} }
function keepalive() { function keepalive() {
@@ -46,20 +107,10 @@ function keepalive() {
} }
function assertNexeBinary(file: string) { function assertNexeBinary(file: string) {
if (!file) throw new Error('Invalid filename: "' + file + '"') return execFileAsync(file).catch(e => {
let result = ''
try {
result = execSync(file).toString('utf8')
} catch (e: any) {
if (e && e.stack && e.stack.includes('Invalid Nexe binary')) { if (e && e.stack && e.stack.includes('Invalid Nexe binary')) {
return return
} }
throw e throw e
} })
throw new Error('Not a bare nexe binary: ' + result)
} }
build().catch((e) => {
console.error(e)
process.exit(1)
})
-2
View File
@@ -1,2 +0,0 @@
export declare function buildArm(target: string): Promise<string>
export declare function buildAlpine(target: string): Promise<string>
+70 -6
View File
@@ -1,9 +1,73 @@
export function buildArm(target: string) { import { NexeTarget, architectures } from '../lib/target'
console.log('building arm: ' + target) import { writeFileAsync, readFileAsync } from '../lib/util'
return Promise.resolve('') import got = require('got')
import execa = require('execa')
import { appendFileSync } from 'fs'
function alpine(target: NexeTarget) {
return `
FROM ${target.arch === 'x64' ? '' : 'i386/'}alpine:3.4
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
WORKDIR /
RUN curl -sSL https://nodejs.org/dist/v\${NODE_VERSION}/node-v\${NODE_VERSION}.tar.gz | tar -xz && \
mkdir /nexe_temp && mv /node-v\${NODE_VERSION} /nexe_temp/\${NODE_VERSION} && \
cd /nexe_temp/\${NODE_VERSION} && \
./configure --prefix=/usr --fully-static && \
make && make install && \
paxctl -cm /usr/bin/node
RUN rm /nexe_temp/\${NODE_VERSION}/out/Release/node && \
npm install -g nexe@\${NEXE_VERSION}
RUN echo "console.log('hello world')" >> index.js && \
nexe --build --no-mangle --temp /nexe_temp -c="--fully-static" -o out
`.trim()
} }
export function buildAlpine(target: string) { function arm(target: NexeTarget) {
console.log('building alpine: ' + target) return `
return Promise.resolve('') FROM hypriot/rpi-node
ENV NEXE_VERSION=latest
WORKDIR /
RUN yarn global add nexe@\${NEXE_VERSION} && \
nexe --build --no-mangle -o out -t ${target.version}
`.trim()
}
export async function runDockerBuild(target: NexeTarget) {
//todo switch on alpine and arm
const dockerfile = alpine(target)
await writeFileAsync('Dockerfile', dockerfile)
const outFilename = 'nexe-docker-build-log.txt'
await writeFileAsync(outFilename, '')
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`))
} catch (e) {
console.log('Error running docker')
appendFileSync(outFilename, e.message)
} finally {
output.forEach((x: any) => {
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))
}
} }
+15 -18
View File
@@ -1,23 +1,20 @@
import { writeFileSync, readFileSync } from 'node:fs' import { writeFileSync, readFileSync } from 'fs'
import { equal } from 'node:assert'
/** /**
* post build step to insert code files into code files (naively). * post build step to insert code files into code files (naively).
* '{{replace:path/to/file}}' => "file contents" * '{{replace:path/to/file}}' => "file contents"
* And the package.json version. * And the package.json version.
*/ */
const totalReplacements = 8 //inject('plugins/nexe-daemon/lib/index.js')
let replaced = 0 cp('src/fs/package.json', 'lib/fs/package.json')
const mods = ['cjs', 'esm'] as const cp('src/fs/bootstrap.js', 'lib/fs/bootstrap.js')
cp('src/fs/README.md', 'lib/fs/README.md')
mods.forEach((x) => { inject('lib/patches/third-party-main.js')
inject(x, `lib/${x}/patches/third-party-main.js`) inject('lib/steps/shim.js')
inject(x, `lib/${x}/steps/shim.js`) inject('lib/options.js', JSON.stringify(require('../package.json').version))
// eslint-disable-next-line @typescript-eslint/no-var-requires
inject(x, `lib/${x}/options.js`, JSON.stringify(require('../package.json').version))
})
function inject(mod: typeof mods[number], filename: string, ...replacements: string[]) { function inject(filename: string, ...replacements: string[]) {
let contents = readFileSync(filename, 'utf8') let contents = readFileSync(filename, 'utf8')
contents = contents.replace(/('{{(.*)}}')/g, (substring: string, ...matches: string[]) => { contents = contents.replace(/('{{(.*)}}')/g, (substring: string, ...matches: string[]) => {
if (!matches || !matches[1]) { if (!matches || !matches[1]) {
@@ -27,15 +24,15 @@ function inject(mod: typeof mods[number], filename: string, ...replacements: str
if (replace !== 'replace') { if (replace !== 'replace') {
return substring return substring
} }
++replaced
console.log('Replacing: ', substring) console.log('Replacing: ', substring)
return replacements[+file] ? replacements[+file] : JSON.stringify(readFileSync(file, 'utf8'))
return replacements[+file]
? replacements[+file]
: JSON.stringify(readFileSync(file.replace('MOD', mod), 'utf8').replace('"use strict";', ''))
}) })
writeFileSync(filename, contents) writeFileSync(filename, contents)
console.log(`Wrote: ${filename}`) console.log(`Wrote: ${filename}`)
} }
equal(replaced, totalReplacements, `Expected to replace ${totalReplacements} things`) function cp(from: string, to: string) {
const file = readFileSync(from)
writeFileSync(to, file)
console.log('Copied: ', from, 'To: ', to)
}
-15
View File
@@ -1,15 +0,0 @@
import * as nexeEsm from '../lib/esm/nexe.js'
import { createRequire } from 'node:module'
import { fileURLToPath } from 'node:url'
import { ok } from 'node:assert'
const cjs = createRequire(fileURLToPath(import.meta.url)),
nexeCjs = cjs('../lib/cjs/nexe.js'),
exports = ['NexeCompiler', 'argv', 'compile', 'help', 'version']
for (const exp of exports) {
ok(exp in nexeCjs)
ok(exp in nexeEsm)
}
console.log('esm and cjs modules match')
+4
View File
@@ -0,0 +1,4 @@
./test/**/*.spec.ts
--check-leaks
--require ts-node/register
--recursive
+11 -32
View File
@@ -1,8 +1,7 @@
import { describe, it, expect } from 'vitest' import { normalizeOptions } from '../src/options'
import { expect } from 'chai'
import * as path from 'path' import * as path from 'path'
import { normalizeOptions } from '../src/options.js'
const ext = process.platform === 'win32' ? '.exe' : '' const ext = process.platform === 'win32' ? '.exe' : ''
describe('options', () => { describe('options', () => {
@@ -28,48 +27,28 @@ describe('options', () => {
expect(options.input).to.equal(path.resolve('./test/fixture/entry.js')) expect(options.input).to.equal(path.resolve('./test/fixture/entry.js'))
}) })
it('should resolve pathed options against cwd', () => { it('should resolve pathed options against cwd', () => {
const cwd = path.join(process.cwd(), 'test/fixture'), const cwd = path.join(process.cwd(), 'test/fixture')
options = normalizeOptions({ const options = normalizeOptions({
cwd, cwd,
input: 'entry', input: 'entry',
output: 'abc', output: 'abc',
temp: './d', temp: './d'
}) })
expect(options.temp).to.equal(path.resolve(cwd, './d')) expect(options.temp).to.equal(path.resolve(cwd, './d'))
expect(options.input).to.equal(path.resolve(cwd, 'entry.js')) expect(options.input).to.equal(path.resolve(cwd, 'entry.js'))
expect(options.output).to.equal(path.resolve(cwd, `abc${ext}`)) 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', () => { describe('output', () => {
it('should work', () => { it('should work', () => {
const options = normalizeOptions({ const options = normalizeOptions({
output: './some-output', output: './some-output'
}) })
expect(options.output).to.equal(path.resolve(`./some-output${ext}`)) expect(options.output).to.equal(path.resolve(`./some-output${ext}`))
}) })
it('should default to the input file name if not index', () => { it('should default to the input file name if not index', () => {
const options = normalizeOptions({ const options = normalizeOptions({
input: './test/fixture', input: './test/fixture'
}) })
expect(options.output).to.equal(path.resolve(`./entry${ext}`)) expect(options.output).to.equal(path.resolve(`./entry${ext}`))
}) })
-1
View File
@@ -1 +0,0 @@
export {}
+6 -8
View File
@@ -1,11 +1,9 @@
import { describe, it, expect } from 'vitest' import { padRight, isWindows } from '../src/util'
import { expect } from 'chai'
import chalk from 'chalk' import chalk from 'chalk'
import { getTarget, NexeTarget } from '../src/target'
import { padRight } from '../src/util.js' const b = chalk.blue
import { getTarget } from '../src/target.js' const arch = process.arch === 'ia32' ? 'x86' : process.arch
const b = chalk.blue,
arch = process.arch === 'ia32' ? 'x86' : process.arch
describe('Targets', () => { describe('Targets', () => {
;[ ;[
@@ -18,7 +16,7 @@ describe('Targets', () => {
['static-x86-6.10.3', 'alpine-x86-6.10.3'], ['static-x86-6.10.3', 'alpine-x86-6.10.3'],
['linux-x32', `linux-x86-${process.version.slice(1)}`], ['linux-x32', `linux-x86-${process.version.slice(1)}`],
['alpine-notsupported-6.10.3', `alpine-${arch}-6.10.3`], ['alpine-notsupported-6.10.3', `alpine-${arch}-6.10.3`],
['not-a-thing', getTarget(process).toString()], ['not-a-thing', getTarget(process).toString()]
].forEach(([input, expected]) => { ].forEach(([input, expected]) => {
it(`should accept: ${padRight(JSON.stringify(input), 53)} ${b('->')} ${expected}`, () => { it(`should accept: ${padRight(JSON.stringify(input), 53)} ${b('->')} ${expected}`, () => {
expect(getTarget(input).toString()).to.equal(expected) expect(getTarget(input).toString()).to.equal(expected)
+6 -17
View File
@@ -1,25 +1,14 @@
{ {
"compilerOptions": { "compilerOptions": {
"outDir": "./lib/types", "target":"es5",
"target":"es2020",
"lib": ["es2020"],
"module": "es2020",
"allowSyntheticDefaultImports": true,
"declaration": true,
"skipLibCheck": true, "skipLibCheck": true,
"moduleResolution": "node",
"experimentalDecorators": true, "experimentalDecorators": true,
"lib": ["es2018"],
"module": "commonjs",
"outDir": "./lib",
"strict": true "strict": true
}, },
"include":[ "include":[
"src/**/*.ts", "src/**/*.ts"
], ]
"ts-node": {
"transpileOnly": true,
"transpiler": "ts-node/transpilers/swc",
"compilerOptions": {
"esModuleInterop": true,
"module": "commonjs"
}
}
} }
+9
View File
@@ -0,0 +1,9 @@
{
"rulesDirectory": ["tslint-plugin-prettier", "tslint-config-prettier"],
"linterOptions": {
"exclude": ["**/node_modules/**/*"]
},
"rules": {
"prettier": [true, { "semi": false, "printWidth": 100, "singleQuote": true }]
}
}