Compare commits
206 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| c48b40b14e | |||
| 1267f5d41d | |||
| 2b4abb1b13 | |||
| ca657b5b06 | |||
| fdd9d97db3 | |||
| a746e00379 | |||
| 1eeac1b538 | |||
| ac1d444b17 | |||
| af7e1cb1be | |||
| ec1fcf66c6 | |||
| 51b478a18d | |||
| 95050d0472 | |||
| eb2ba5007a | |||
| e5ae6a124a | |||
| 4cd04d1b0c | |||
| e539093ef4 | |||
| 805ca35149 | |||
| 37ee352408 | |||
| a9811257ea | |||
| dd3dec1f9d | |||
| fe9f73d22b | |||
| 0c7b942f7f | |||
| bd09fe59de | |||
| 9962630ace | |||
| 232e1005e6 | |||
| 9f22309949 | |||
| cf8e6ff393 | |||
| 7275d4b848 | |||
| 06a8242114 | |||
| 2935ee3f93 | |||
| 9f1f323b09 | |||
| 0ba696e976 | |||
| 0f0869b292 | |||
| c5dabbf9b4 | |||
| e51b6b21a6 | |||
| 2b261728b4 | |||
| 017abb94cc | |||
| 32033b6d15 | |||
| bc1d579baa | |||
| 6ffd47f1f1 | |||
| c4e16fb6e0 | |||
| ea6f1f0808 | |||
| c1055149ab | |||
| 79fffc358a | |||
| c8cf13a9dd | |||
| 928b8134a7 | |||
| 0a2e8dba00 | |||
| 01c977bb3c | |||
| ac5bf1876a | |||
| d6ba5d193f | |||
| b785b72724 | |||
| de6bb58a10 | |||
| 56dfef1e45 | |||
| 8f3d29812a | |||
| c44877d6ad | |||
| a4db04dbee | |||
| ec7f7f318e | |||
| e49d72db88 | |||
| 1686c1f68c | |||
| 1e54736fec | |||
| 4112bd7b3e | |||
| 5ec04f5791 | |||
| 098a746e0d | |||
| cc2c5e31fc | |||
| fe26b540de | |||
| a143c470fb | |||
| eb887363de | |||
| de9894cf47 | |||
| 2e2d381969 | |||
| 7d0f435bef | |||
| efd3dfc35a | |||
| 9c1d67b2e6 | |||
| 93e0a021d3 | |||
| 021f50d50f | |||
| bf5ff7d9bd | |||
| 86c3acedb1 | |||
| ecb3d41a97 | |||
| 1eb44797d0 | |||
| 1023b72513 | |||
| 0cf436c9a7 | |||
| 77f49eb07a | |||
| 9bc98bf597 | |||
| 7e9a05675c | |||
| e62d728624 | |||
| a0c8d31f03 | |||
| 472b98d839 | |||
| 9ae6ed8ae8 | |||
| a0c648bc8b | |||
| 463595f502 | |||
| be4ab09745 | |||
| a6ad034336 | |||
| 0afbe3b732 | |||
| 0865fda5ef | |||
| 7bfdc39700 | |||
| 9486399cec | |||
| 75bf6a3dc4 | |||
| 0dca0745ee | |||
| 6fc2ed9519 | |||
| 448f4270ea | |||
| c9c9b5a0a3 | |||
| d2756a5f75 | |||
| 255f3887c7 | |||
| 75ae41b7b9 | |||
| 3692c142fb | |||
| af2e381ed4 | |||
| 44393a22da | |||
| 57a08d2cfd | |||
| 6825cef609 | |||
| b3c2d2e764 | |||
| d73325ba35 | |||
| 6e3cadbe22 | |||
| de42dd94ad | |||
| 37192e4ca8 | |||
| c5cdbd9380 | |||
| b022cd525d | |||
| 72d9dfebf6 | |||
| 8849ac0c0c | |||
| 8ad6641278 | |||
| 1a75bdb058 | |||
| 12c77a34fd | |||
| c76edb7c0b | |||
| 09d7093295 | |||
| 3a091f45bd | |||
| 9575c0811b | |||
| ab6b540e23 | |||
| dcea374922 | |||
| b3b6c6b936 | |||
| 058c34ee8a | |||
| 9750c70873 | |||
| 7bc3a83667 | |||
| aa93ab6516 | |||
| c681a62566 | |||
| 2ea0f897d5 | |||
| cfa3036694 | |||
| c3ba3ec872 | |||
| 142338ede6 | |||
| e3f1d6fc74 | |||
| 0db8122f8f | |||
| 129c2f86a0 | |||
| db766e2832 | |||
| e6a416cc4f | |||
| 35f4811826 | |||
| 891ac0ab2a | |||
| 18bbf24456 | |||
| 689160e833 | |||
| bd3ae2e80a | |||
| 0447d8004c | |||
| 11be5a2573 | |||
| 664dc6a11b | |||
| 4a7bfd99b6 | |||
| a3af96eae8 | |||
| 8e41015c8d | |||
| 8382a2c1b3 | |||
| d385923c5a | |||
| 50ebc4fc32 | |||
| 53ef02f87a | |||
| c70d93b72f | |||
| d4a194b239 | |||
| dbcbadf9a5 | |||
| c3a2fd9eb4 | |||
| b6dd232e7a | |||
| f69b219750 | |||
| ad41f07d85 | |||
| 5ac93b43ec | |||
| 54212cbc52 | |||
| f4d3ce954a | |||
| b8522b6310 | |||
| d6d81b9e23 | |||
| 34f3ddc26a | |||
| 8407f0fc38 | |||
| a4f4f3edf8 | |||
| babd6ac328 | |||
| 56d2b9ab53 | |||
| 48b61442db | |||
| b61c0df51d | |||
| 92058b6137 | |||
| ce9cdcba46 | |||
| f9bc43a03b | |||
| e84e236a3d | |||
| 8fd84fd34d | |||
| 901c51d6ba | |||
| 9190b0df77 | |||
| 687c2e8cfc | |||
| 4eeeb55706 | |||
| c6d9cd92ad | |||
| c1d7e6a406 | |||
| 86c919aac5 | |||
| 2271e426e2 | |||
| bf65477ca3 | |||
| db7cdf0200 | |||
| ea93e16f40 | |||
| 966f8b4d51 | |||
| f77ed75603 | |||
| 4fe39d4b68 | |||
| 91033c284a | |||
| 5c4ea55b13 | |||
| 7768567380 | |||
| 41578e0115 | |||
| 089aa02a82 | |||
| 92fa19cba6 | |||
| 8dd5cf1973 | |||
| 24c0b6be76 | |||
| e65ce4df11 | |||
| b91576973d | |||
| 9a9511a429 | |||
| 4cf87e68e6 |
+1
-2
@@ -4,6 +4,5 @@ end_of_line = lf
|
|||||||
charset = utf-8
|
charset = utf-8
|
||||||
indent_style = space
|
indent_style = space
|
||||||
indent_size = 2
|
indent_size = 2
|
||||||
#https://github.com/Microsoft/vscode/issues/23983#event-1087502108
|
trim_trailing_whitespace = true
|
||||||
#trim_trailing_whitespace = true
|
|
||||||
insert_final_newline = true
|
insert_final_newline = true
|
||||||
|
|||||||
@@ -0,0 +1 @@
|
|||||||
|
custom: https://www.paypal.me/calebsboyd
|
||||||
@@ -0,0 +1,23 @@
|
|||||||
|
---
|
||||||
|
name: Bug Report
|
||||||
|
about: Report a bug encountered while running Nexe
|
||||||
|
labels: bug
|
||||||
|
|
||||||
|
---
|
||||||
|
<!-- Please use this template while reporting a bug and provide as much info as possible. Not doing so may result in your bug not being addressed in a timely manner. Thanks!
|
||||||
|
-->
|
||||||
|
|
||||||
|
**What happened**:
|
||||||
|
|
||||||
|
**What you expected to happen**:
|
||||||
|
|
||||||
|
**How to reproduce it (as minimally and precisely as possible)**:
|
||||||
|
|
||||||
|
**Anything else we need to know?**:
|
||||||
|
|
||||||
|
**Environment**:
|
||||||
|
- Platform(OS/Version):
|
||||||
|
- Host Node Version:
|
||||||
|
- Target Node Version:
|
||||||
|
- Nexe version:
|
||||||
|
- Python Version:
|
||||||
@@ -0,0 +1,11 @@
|
|||||||
|
---
|
||||||
|
name: Feature Request
|
||||||
|
about: Suggest an feature request
|
||||||
|
labels: feature
|
||||||
|
|
||||||
|
---
|
||||||
|
<!-- Please only use this template for submitting feature requests -->
|
||||||
|
|
||||||
|
**What would you like to be added**:
|
||||||
|
|
||||||
|
**Why is this needed**:
|
||||||
@@ -0,0 +1,11 @@
|
|||||||
|
**What this PR does / why we need it**:
|
||||||
|
|
||||||
|
**Which issue(s) this PR fixes**:
|
||||||
|
<!--
|
||||||
|
*Automatically closes linked issue when PR is merged.
|
||||||
|
Usage: `Fixes #<issue number>`, or `Fixes (paste link of issue)`.
|
||||||
|
_If PR is about `failing-tests or flakes`, please post the related issues/tests in a comment and do not use `Fixes`_*
|
||||||
|
-->
|
||||||
|
Fixes #
|
||||||
|
|
||||||
|
**Special notes for your reviewer**:
|
||||||
@@ -0,0 +1,21 @@
|
|||||||
|
name: No Response
|
||||||
|
|
||||||
|
# Both `issue_comment` and `scheduled` event types are required for this Action
|
||||||
|
# to work properly.
|
||||||
|
on:
|
||||||
|
issue_comment:
|
||||||
|
types: [created]
|
||||||
|
schedule:
|
||||||
|
# 9AM Central
|
||||||
|
- 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
|
||||||
@@ -1,6 +1,7 @@
|
|||||||
.DS_Store
|
.DS_Store
|
||||||
temp/
|
temp/
|
||||||
coverage
|
coverage
|
||||||
|
nexe
|
||||||
node_modules
|
node_modules
|
||||||
*.log
|
*.log
|
||||||
*.exe
|
*.exe
|
||||||
|
|||||||
-12
@@ -1,12 +0,0 @@
|
|||||||
language: node_js
|
|
||||||
before_install:
|
|
||||||
- sudo apt-get -qq update
|
|
||||||
- sudo apt-get install -y g++-multilib
|
|
||||||
node_js:
|
|
||||||
- '6'
|
|
||||||
script: npm run asset-compile
|
|
||||||
env:
|
|
||||||
global:
|
|
||||||
- secure: LyC6djYqPfPKz5gHILES9JmSRxQ+ntKOcoaZNM5WID0+gogUoXZBhcmmtvq9RnMpFZN3pYujY6LB5iy7QS2seGjg+feyewNKI30yIK6N9ulJyZZKmrJVDdRx4wvl8YVTkttjcJFkanDGa6zRvFfFDKx/iIdcWLEpnqR/WO1ppf8=
|
|
||||||
notifications:
|
|
||||||
email: false
|
|
||||||
Vendored
+1
-3
@@ -1,5 +1,3 @@
|
|||||||
{
|
{
|
||||||
"recommendations": [
|
"recommendations": [ "ms-vscode.vscode-typescript-tslint-plugin" ]
|
||||||
"esbenp.prettier-vscode"
|
|
||||||
]
|
|
||||||
}
|
}
|
||||||
|
|||||||
Vendored
+5
-6
@@ -1,9 +1,7 @@
|
|||||||
{
|
{
|
||||||
"typescript.tsdk": "./node_modules/typescript/lib",
|
"tslint.enable": true,
|
||||||
"prettier.semi": false,
|
"tslint.run": "onType",
|
||||||
"prettier.singleQuote": true,
|
"tslint.autoFixOnSave": true,
|
||||||
"prettier.typescriptEnable": ["typescript"],
|
|
||||||
"editor.trimAutoWhitespace": true,
|
|
||||||
"files.exclude": {
|
"files.exclude": {
|
||||||
"**/.git": true,
|
"**/.git": true,
|
||||||
"**/.svn": true,
|
"**/.svn": true,
|
||||||
@@ -15,5 +13,6 @@
|
|||||||
"lib/**/*": true,
|
"lib/**/*": true,
|
||||||
"**/node_modules": true,
|
"**/node_modules": true,
|
||||||
"**/bower_components": true
|
"**/bower_components": true
|
||||||
}
|
},
|
||||||
|
"typescript.tsdk": "node_modules\\typescript\\lib"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
Copyright (c) 2013-2017 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
|
||||||
|
|||||||
@@ -1,14 +1,15 @@
|
|||||||
|
|
||||||
<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">
|
||||||
<a href="https://circleci.com/gh/nexe/nexe"><img src="https://img.shields.io/circleci/project/nexe/nexe.svg" alt="Build Status"></a>
|
<a href="https://dev.azure.com/nexe-ci/Nexe/_build?definitionId=1"><img src="https://img.shields.io/azure-devops/build/nexe-ci/nexe/1/master.svg" alt="Build Status"></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/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://gitter.im/nexe/nexe?utm_source=badge&utm_medium=badge"><img src="https://badges.gitter.im/nexe/nexe.svg"></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"><code>npm i nexe -g</code></p>
|
<p align="center">Install: <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">
|
||||||
@@ -40,8 +41,7 @@ For more CLI options see: `nexe --help`
|
|||||||
|
|
||||||
### Examples
|
### Examples
|
||||||
|
|
||||||
- `nexe server.js -r public/**/*.html`
|
- `nexe server.js -r "public/**/*.html"`
|
||||||
- `nexe my-bundle.js --no-bundle -o app.exe`
|
|
||||||
- `nexe --build`
|
- `nexe --build`
|
||||||
- `nexe -t x86-8.0.0`
|
- `nexe -t x86-8.0.0`
|
||||||
|
|
||||||
@@ -49,10 +49,39 @@ 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 Node
|
## Compiling the nexe Executable
|
||||||
|
|
||||||
By default `nexe` will attempt to download a pre-built executable. However, It may be unavailable ([github releases](https://github.com/nexe/nexe/releases))
|
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)`).
|
||||||
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:**
|
||||||
|
- The above works and has been tested with node.js `14.5.4` and `15.8.0`
|
||||||
|
- 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
|
||||||
|
|
||||||
@@ -88,14 +117,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-6.10.3'`
|
- 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-8.6.0`
|
- `'win32-x86-10.13.0`
|
||||||
- `{ platform: 'alpine' }`
|
- `{ platform: 'alpine' }`
|
||||||
- `darwin-8.6.0`
|
- `darwin-10.13.0`
|
||||||
- `linux-x64`
|
- `linux-x64`
|
||||||
- `macos-8.4.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.
|
||||||
@@ -113,10 +142,19 @@ compile({
|
|||||||
- #### `cwd: string`
|
- #### `cwd: string`
|
||||||
- Directory nexe will operate on as though it is the cwd
|
- Directory nexe will operate on as though it is the cwd
|
||||||
- default: process.cwd()
|
- default: process.cwd()
|
||||||
|
- #### `mangle: boolean`
|
||||||
|
- If set to false, nexe will not include the virtual filesystem (your application and resources) on the output.
|
||||||
|
- This will cause the output to error as an "Invalid Binary" unless a userland patch alters the contents of lib/_third_party_main.js in the nodejs source.
|
||||||
|
- 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`
|
||||||
|
- Provide a pre-built nexe binary asset, this is a file path is resolved relative to cwd.
|
||||||
- #### `python: string`
|
- #### `python: string`
|
||||||
- On Linux this is the path pointing to your python2 executable
|
- On Linux this is the path pointing to your python3 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[]`
|
||||||
@@ -128,10 +166,11 @@ compile({
|
|||||||
- Example: `['--with-dtrace', '--dest-cpu=x64']`
|
- Example: `['--with-dtrace', '--dest-cpu=x64']`
|
||||||
- default: `[]`
|
- default: `[]`
|
||||||
- #### `make: string[]`
|
- #### `make: string[]`
|
||||||
- Array of arguments for the node build make step, on windows this step recieves options for vcBuild.bat
|
- Array of arguments for the node build make step
|
||||||
- default: `[]` or `['nosign', 'release']` for non windows systems
|
- default: `[]`
|
||||||
- #### `vcBuild: string[]`
|
- #### `vcBuild: string[]`
|
||||||
- Alias for `make` option
|
- Options for windows build
|
||||||
|
- default: `['nosign', 'release']`
|
||||||
- #### `snapshot: string`
|
- #### `snapshot: string`
|
||||||
- path to a file to be used as the warmup snapshot for the build
|
- path to a file to be used as the warmup snapshot for the build
|
||||||
- default: `null`
|
- default: `null`
|
||||||
@@ -142,12 +181,12 @@ compile({
|
|||||||
- #### `temp: string`
|
- #### `temp: string`
|
||||||
- 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` in the cwd
|
- default: `~/.nexe`
|
||||||
- #### `ico: string`
|
- #### `ico: string`
|
||||||
- Path to a user provided icon to be used (Windows only). Requires `--build` to be set.
|
- Path to a user provided icon to be used (Windows only). Requires `--build` to be set.
|
||||||
- #### `rc: object`
|
- #### `rc: object`
|
||||||
- Settings for patching the [node.rc](https://github.com/nodejs/node/blob/master/src/res/node.rc) configuration file (Windows only).
|
- Settings for patching the [node.rc](https://github.com/nodejs/node/blob/master/src/res/node.rc) configuration file (Windows only).
|
||||||
- Example:
|
- Example (keys may vary depending on the version. Reference the file linked above):
|
||||||
```javascript
|
```javascript
|
||||||
{
|
{
|
||||||
CompanyName: "ACME Corp",
|
CompanyName: "ACME Corp",
|
||||||
@@ -165,7 +204,7 @@ compile({
|
|||||||
variable will still be processed. NODE_OPTIONS support can be disabled with the `--without-node-options` configure flag.
|
variable will still be processed. NODE_OPTIONS support can be disabled with the `--without-node-options` configure flag.
|
||||||
- default: `false`
|
- default: `false`
|
||||||
- #### `fakeArgv: boolean`
|
- #### `fakeArgv: boolean`
|
||||||
- fake the entry point file name (`process.argv[1]`). If nexe was used with stdin this will be `'[stdin]'`.
|
- fake the entry point file name (`process.argv[1]`). If nexe was used with stdin this will be `'[stdin]'`.
|
||||||
- #### `ghToken: string`
|
- #### `ghToken: string`
|
||||||
- Provide a Github Token for accessing nexe releases
|
- Provide a Github Token for accessing nexe releases
|
||||||
- This is usually needed in CI environments
|
- This is usually needed in CI environments
|
||||||
@@ -197,7 +236,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): void`
|
- `addResource(filename: string, contents: Buffer): Promise<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.
|
||||||
@@ -211,15 +250,20 @@ Any modifications made to `NexeFile#contents` will be maintained in the cache _w
|
|||||||
|
|
||||||
## Native Modules
|
## Native Modules
|
||||||
|
|
||||||
Any `.node` binding can be used with nexe. These library files will be bundled and written alongside the resulting binary at runtime. Currently, nexe supports modules loaded directly (`.node` files) and those loaded with the `'bindings'` module. It does not yet support modules using `node-pre-gyp#find`.
|
In order to use native modules, the native binaries must be shipped alongside the binary generated by nexe.
|
||||||
|
|
||||||
Its important to note: unless your native module conditionally loads each platform binary. Nexe builds with native modules will be platform specific. Eg. You will no longer be able to use cross platform builds.
|
## Troubleshooting
|
||||||
|
|
||||||
Nexe builds with native modules will need to target the same version, platform and architecture as the platform hosting the module. At least until [N-API](https://github.com/nodejs/abi-stable-node) is fully propegated
|
`Error: Entry file "" not found!` means you need to provide `nexe` with input. Either use `-i` or pipe data to it.
|
||||||
|
|
||||||
TODO
|
`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
|
||||||
- [ ] Implement support for `node-pre-gyp#find`.
|
- 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-14.15.3`
|
||||||
|
- 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
|
||||||
|
|
||||||
@@ -227,20 +271,10 @@ Building
|
|||||||
```
|
```
|
||||||
$ git clone git@github.com:nexe/nexe.git
|
$ git clone git@github.com:nexe/nexe.git
|
||||||
$ cd nexe
|
$ cd nexe
|
||||||
$ yarn
|
$ npm i && npm run build
|
||||||
```
|
```
|
||||||
|
|
||||||
Testing
|
Testing
|
||||||
```
|
```
|
||||||
$ npm test
|
$ npm test
|
||||||
```
|
```
|
||||||
|
|
||||||
## Maintainers
|
|
||||||
|
|
||||||
[](https://jaredallard.me/) | [](https://github.com/calebboyd) | [](https://github.com/ckarper) | [](https://github.com/dgreif) |
|
|
||||||
---|---|---|---
|
|
||||||
[Jared Allard](https://github.com/jaredallard) | [Caleb Boyd](http://github.com/calebboyd) | [Christopher Karper](https://github.com/ckarper) | [Dustin Greif](https://github.com/dgreif) |
|
|
||||||
|
|
||||||
### Former
|
|
||||||
|
|
||||||
- [Craig Condon](http://crcn.codes/)
|
|
||||||
|
|||||||
@@ -1,18 +0,0 @@
|
|||||||
environment:
|
|
||||||
CIRCLE_TOKEN:
|
|
||||||
secure: TQKcepXmTzCNt4+tUBtYpwEQkdSPwFr9A8ugtoMhNbKu/SW1WM1EpjEu6kYXxpQ4
|
|
||||||
TRAVIS_TOKEN:
|
|
||||||
secure: tR7HXYv3x97q90uvPrjUxKZh7R1+uqKct0HdEcqTbsg=
|
|
||||||
GITHUB_TOKEN:
|
|
||||||
secure: 3wuEGJsppSKFvdwhp3jprUA9Zkc3WINlc/9oFXjhAR6J05lYMXP7Fl7lXTKpkGZx
|
|
||||||
install:
|
|
||||||
- ps: Install-Product node 6
|
|
||||||
- yarn
|
|
||||||
build: off
|
|
||||||
test: off
|
|
||||||
build_script:
|
|
||||||
- yarn run asset-compile
|
|
||||||
artifacts:
|
|
||||||
- path: .nexe\**\node.exe
|
|
||||||
cache:
|
|
||||||
- node_modules
|
|
||||||
@@ -0,0 +1,73 @@
|
|||||||
|
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: 360
|
||||||
|
strategy:
|
||||||
|
matrix:
|
||||||
|
linux:
|
||||||
|
imageName: 'ubuntu-16.04'
|
||||||
|
mac:
|
||||||
|
imageName: 'macos-10.15'
|
||||||
|
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: '12.x'
|
||||||
|
- script: sudo apt-get update && sudo apt-get install -y libc6-dev-i386 gcc-multilib g++-multilib
|
||||||
|
condition: contains(variables['Agent.JobName'], 'linux')
|
||||||
|
displayName: Install Linux build dependencies
|
||||||
|
- script: npm config set msvs_version 2015
|
||||||
|
condition: contains(variables['Agent.JobName'], 'windows_2015')
|
||||||
|
displayName: Install Windows build dependencies
|
||||||
|
- script: npm install && npm run ci:build
|
||||||
|
displayName: Build Nexe
|
||||||
|
env:
|
||||||
|
GITHUB_TOKEN: $(PersonalGithubToken)
|
||||||
|
NEXE_VERBOSE: $(NEXE_VERBOSE)
|
||||||
|
msbuild_args: /3G
|
||||||
|
condition: not(contains(variables['Agent.JobName'], 'windows'))
|
||||||
|
- powershell: |
|
||||||
|
choco install nasm
|
||||||
|
npm install
|
||||||
|
npm run ci:build
|
||||||
|
displayName: Build Nexe (Windows)
|
||||||
|
condition: contains(variables['Agent.JobName'], 'windows')
|
||||||
|
env:
|
||||||
|
GITHUB_TOKEN: $(PersonalGithubToken)
|
||||||
|
NEXE_VERBOSE: $(NEXE_VERBOSE)
|
||||||
|
- script: npm run test:integration
|
||||||
|
displayName: Test built artefact
|
||||||
|
env:
|
||||||
|
NEXE_VERBOSE: $(NEXE_VERBOSE)
|
||||||
|
BUILD: ''
|
||||||
@@ -1,9 +0,0 @@
|
|||||||
dependencies:
|
|
||||||
override:
|
|
||||||
- export NVS_HOME="$HOME/.nvs" && git clone https://github.com/jasongin/nvs "$NVS_HOME" && . "$NVS_HOME/nvs.sh" install
|
|
||||||
- nvs add lts && nvs link lts && nvs use default
|
|
||||||
- npm i yarn -g
|
|
||||||
- yarn
|
|
||||||
test:
|
|
||||||
override:
|
|
||||||
- yarn run asset-compile
|
|
||||||
@@ -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)
|
||||||
|
|
||||||
Generated
+373
@@ -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="
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,16 +1,15 @@
|
|||||||
{
|
{
|
||||||
"name": "native-build",
|
"name": "express-app",
|
||||||
"version": "1.0.0",
|
"version": "1.0.0",
|
||||||
"description": "",
|
"description": "",
|
||||||
"main": "index.js",
|
"main": "index.js",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"build": "node build"
|
"test": "echo \"Error: no test specified\" && exit 1"
|
||||||
},
|
},
|
||||||
|
"keywords": [],
|
||||||
"author": "",
|
"author": "",
|
||||||
"license": "ISC",
|
"license": "ISC",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"sqlite3": "^3.1.10",
|
"express": "^4.16.3"
|
||||||
"zmq": "^2.15.3"
|
}
|
||||||
},
|
|
||||||
"devDependencies": {}
|
|
||||||
}
|
}
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
<h1>Hello World!</h1>
|
||||||
@@ -1,13 +0,0 @@
|
|||||||
const nexe = require('../..')
|
|
||||||
nexe.compile({
|
|
||||||
output: 'native-build',
|
|
||||||
silent: true,
|
|
||||||
native: {
|
|
||||||
zmq: {
|
|
||||||
additionalFiles: [
|
|
||||||
'../../windows/lib/x64/libzmq-v100-mt-4_0_4.dll'
|
|
||||||
]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
})
|
|
||||||
|
|
||||||
@@ -1,18 +0,0 @@
|
|||||||
var zmq = require('zmq')
|
|
||||||
var pub = zmq.socket('pub')
|
|
||||||
|
|
||||||
pub.bindSync('tcp://127.0.0.1:3000')
|
|
||||||
console.log('Publisher bound to port 3000')
|
|
||||||
|
|
||||||
setInterval(function(){
|
|
||||||
console.log('sending a multipart message envelope')
|
|
||||||
pub.send(['kitty cats', 'meow!'])
|
|
||||||
}, 2500)
|
|
||||||
var sub = zmq.socket('sub')
|
|
||||||
sub.connect('tcp://127.0.0.1:3000')
|
|
||||||
sub.subscribe('kitty cats')
|
|
||||||
console.log('Subscriber connected to port 3000')
|
|
||||||
|
|
||||||
sub.on('message', function(topic, message) {
|
|
||||||
console.log('received a message related to:', topic.toString(), 'containing message:', message.toString())
|
|
||||||
})
|
|
||||||
@@ -10,7 +10,22 @@ if (require.main === module) {
|
|||||||
process.stderr.write(showHelp ? options.help : options.version + eol)
|
process.stderr.write(showHelp ? options.help : options.version + eol)
|
||||||
} else {
|
} else {
|
||||||
const nexe = require('./lib/nexe')
|
const nexe = require('./lib/nexe')
|
||||||
nexe.compile(argv)
|
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 {
|
||||||
module.exports = require('./lib/nexe')
|
module.exports = require('./lib/nexe')
|
||||||
|
|||||||
@@ -1,21 +0,0 @@
|
|||||||
This is a
|
|
||||||
- [ ] Bug Report
|
|
||||||
- [ ] Feature Request
|
|
||||||
- [ ] Other
|
|
||||||
|
|
||||||
<br/>
|
|
||||||
If this is a bug report, What are the steps to reproduce?
|
|
||||||
|
|
||||||
```
|
|
||||||
//provide configuration here
|
|
||||||
```
|
|
||||||
|
|
||||||
<br/><br/>
|
|
||||||
Please also provide:
|
|
||||||
|
|
||||||
- Platform(OS/Version):
|
|
||||||
- Host Node Version:
|
|
||||||
- Target Node Version:
|
|
||||||
- Nexe version:
|
|
||||||
- Python Version:
|
|
||||||
|
|
||||||
Generated
+9155
File diff suppressed because it is too large
Load Diff
+60
-38
@@ -2,20 +2,23 @@
|
|||||||
"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",
|
||||||
"version": "2.0.0-rc.25",
|
"version": "5.0.0-beta.1",
|
||||||
"contributors": [
|
"contributors": [
|
||||||
"Craig Condon <craig.j.condon@gmail.com> (http://crcn.io)",
|
"Craig Condon <craig.j.condon@gmail.com> (http://crcn.io)",
|
||||||
"Jared Allard <jaredallard@outlook.com>",
|
"Jared Allard <jaredallard@outlook.com>",
|
||||||
"Caleb Boyd <caleb.boyd@hotmail.com>"
|
"Caleb Boyd <caleb.boyd@hotmail.com>"
|
||||||
],
|
],
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"asset-compile": "ts-node tasks/asset-compile",
|
"ci:build": "ts-node tasks/build",
|
||||||
"test": "mocha",
|
"test": "mocha",
|
||||||
"fmt": "prettier --parser typescript --no-semi --print-width 100 --single-quote --write \"{src,plugins,tasks}/**/*.ts\"",
|
"test:integration": "node index.js --target 14.15.3 -i test/integration/index.js -o integration-tests --verbose -r test/integration -r node_modules/ && npm run test:integration:run",
|
||||||
"prepare": "npm run build",
|
"test:integration:run": "run-script-os",
|
||||||
"prepublishOnly": "npm test",
|
"test:integration:run:win32": "integration-tests.exe",
|
||||||
"prebuild": "rimraf lib && npm run fmt",
|
"test:integration:run:default": "./integration-tests",
|
||||||
"build": "tsc --declaration",
|
"lint": "tslint \"{src,plugins,tasks}/**/*.ts\" --fix",
|
||||||
|
"prepare": "npm run lint && npm run build && npm test",
|
||||||
|
"prebuild": "rimraf lib",
|
||||||
|
"build": "tsc --declaration && tsc -p tasks && webpack",
|
||||||
"postbuild": "ts-node tasks/post-build"
|
"postbuild": "ts-node tasks/post-build"
|
||||||
},
|
},
|
||||||
"repository": {
|
"repository": {
|
||||||
@@ -23,8 +26,7 @@
|
|||||||
"url": "git://github.com/nexe/nexe.git"
|
"url": "git://github.com/nexe/nexe.git"
|
||||||
},
|
},
|
||||||
"files": [
|
"files": [
|
||||||
"lib",
|
"lib"
|
||||||
"source-map-support.js"
|
|
||||||
],
|
],
|
||||||
"typings": "lib/nexe.d.ts",
|
"typings": "lib/nexe.d.ts",
|
||||||
"main": "index.js",
|
"main": "index.js",
|
||||||
@@ -32,39 +34,59 @@
|
|||||||
"nexe": "index.js"
|
"nexe": "index.js"
|
||||||
},
|
},
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">=6"
|
"node": ">=10"
|
||||||
|
},
|
||||||
|
"mocha": {
|
||||||
|
"spec": "./test/**/*.spec.ts",
|
||||||
|
"checkLeaks": true,
|
||||||
|
"require": [
|
||||||
|
"ts-node/register"
|
||||||
|
]
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"app-builder": "^5.1.0",
|
"@calebboyd/semaphore": "^1.3.1",
|
||||||
"typescript": "2.5.3",
|
"@yarnpkg/fslib": "^3.0.0-rc.43",
|
||||||
|
"@yarnpkg/libzip": "^3.0.0-rc.43",
|
||||||
|
"app-builder": "^7.0.4",
|
||||||
|
"archiver": "^5.3.1",
|
||||||
"caw": "^2.0.1",
|
"caw": "^2.0.1",
|
||||||
"chalk": "^1.1.3",
|
"chalk": "^2.4.2",
|
||||||
"download": "^6.2.0",
|
"download": "^8.0.0",
|
||||||
"fuse-box": "^3.1.0",
|
"globby": "^11.0.2",
|
||||||
"globby": "^6.1.0",
|
"got": "^12.6.0",
|
||||||
"got": "^8.0.3",
|
"meriyah": "^4.3.5",
|
||||||
"minimist": "^1.2.0",
|
"minimist": "^1.2.8",
|
||||||
"mkdirp": "^0.5.1",
|
"mkdirp": "^1.0.4",
|
||||||
"ora": "^1.2.0",
|
"multistream": "^4.1.0",
|
||||||
"pifi": "1.0.0",
|
"ora": "^3.4.0",
|
||||||
"rimraf": "^2.6.1",
|
"resolve-dependencies": "^6.0.9",
|
||||||
"uglify-js": "3.0.28"
|
"rimraf": "^3.0.2",
|
||||||
|
"run-script-os": "^1.1.6",
|
||||||
|
"webpack-config-prefabs": "0.0.5"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@types/chai": "^4.0.4",
|
"@types/archiver": "^5.3.2",
|
||||||
"@types/chalk": "^0.4.31",
|
"@types/chai": "^4",
|
||||||
"@types/execa": "^0.7.0",
|
"@types/download": "^8",
|
||||||
"@types/globby": "^0.6.0",
|
"@types/globby": "^9",
|
||||||
"@types/minimist": "^1.2.0",
|
"@types/lodash": "^4.14.192",
|
||||||
"@types/mkdirp": "^0.3.29",
|
"@types/minimist": "^1.2.2",
|
||||||
"@types/mocha": "^2.2.42",
|
"@types/mkdirp": "^1.0.2",
|
||||||
"@types/ora": "^0.3.31",
|
"@types/mocha": "^10.0.1",
|
||||||
"@types/pify": "0.0.28",
|
"@types/multistream": "^4.1.0",
|
||||||
"@types/rimraf": "0.0.28",
|
"@types/ora": "^3.2.0",
|
||||||
"chai": "^4.1.2",
|
"@types/rimraf": "3.0.2",
|
||||||
"execa": "^0.8.0",
|
"@types/semver": "^7.3.13",
|
||||||
"mocha": "^3.5.0",
|
"chai": "^4.3.7",
|
||||||
"prettier": "^1.6.1",
|
"execa": "^5.1.1",
|
||||||
"ts-node": "3.3.0"
|
"lodash": "^4.17.21",
|
||||||
|
"mocha": "^10.2.0",
|
||||||
|
"prettier": "^2.8.7",
|
||||||
|
"ts-node": "^10.9.1",
|
||||||
|
"tslint": "^6.1.1",
|
||||||
|
"tslint-config-prettier": "^1.18.0",
|
||||||
|
"tslint-plugin-prettier": "^2.3.0",
|
||||||
|
"typescript": "^5.0.3",
|
||||||
|
"webpack-cli": "^5.0.1"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,24 +0,0 @@
|
|||||||
{
|
|
||||||
"name": "nexe-daemon",
|
|
||||||
"version": "1.0.0",
|
|
||||||
"description": "Plugin for nexe to create installable services",
|
|
||||||
"main": "lib/index.js",
|
|
||||||
"scripts": {
|
|
||||||
"clean": "rimraf *.js",
|
|
||||||
"build": "tsc",
|
|
||||||
"postpublish": "npm run clean"
|
|
||||||
},
|
|
||||||
"files": [
|
|
||||||
"lib",
|
|
||||||
"winsw.exe"
|
|
||||||
],
|
|
||||||
"author": "Caleb Boyd",
|
|
||||||
"license": "MIT",
|
|
||||||
"devDependencies": {
|
|
||||||
"rimraf": "^2.6.2",
|
|
||||||
"typescript": "^2.5.2"
|
|
||||||
},
|
|
||||||
"dependencies": {
|
|
||||||
"nexe": "^2.0.0-rc.11"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,48 +0,0 @@
|
|||||||
import { NexeCompiler, NexeOptions } from 'nexe'
|
|
||||||
import { readFileSync } from 'fs'
|
|
||||||
import { join } from 'path'
|
|
||||||
|
|
||||||
interface NexeDaemonOptions {
|
|
||||||
id: string
|
|
||||||
name: string
|
|
||||||
description: string
|
|
||||||
executable: string
|
|
||||||
}
|
|
||||||
|
|
||||||
type DaemonOptions = NexeOptions & { daemon: { windows: NexeDaemonOptions } }
|
|
||||||
|
|
||||||
function renderWinswConfig(options: any) {
|
|
||||||
return (
|
|
||||||
'<configuration>\r\n' +
|
|
||||||
`${Object.keys(options).reduce((config: string, element: string) => {
|
|
||||||
return (config += `<${element}>${options[element]}</${element}>\r\n`)
|
|
||||||
}, '')}</configuration>\r\n`
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
export default function daemon(compiler: NexeCompiler<DaemonOptions>, next: () => Promise<void>) {
|
|
||||||
if (compiler.target.platform !== 'windows') {
|
|
||||||
return next()
|
|
||||||
}
|
|
||||||
compiler.addResource(
|
|
||||||
'./nexe/plugin/daemon/winsw.exe',
|
|
||||||
readFileSync(require.resolve('../winsw.exe'))
|
|
||||||
)
|
|
||||||
const name = compiler.options.name,
|
|
||||||
options = (compiler.options.daemon && compiler.options.daemon.windows) || {},
|
|
||||||
defaults: NexeDaemonOptions = {
|
|
||||||
id: name,
|
|
||||||
name,
|
|
||||||
description: name,
|
|
||||||
executable: '%BASE%\\' + compiler.output
|
|
||||||
}
|
|
||||||
|
|
||||||
compiler.addResource(
|
|
||||||
'./nexe/plugin/daemon/winsw.xml',
|
|
||||||
Buffer.from(renderWinswConfig(Object.assign(defaults, options)))
|
|
||||||
)
|
|
||||||
compiler.addResource('./nexe/plugin/daemon/app.js', Buffer.from(compiler.input))
|
|
||||||
compiler.input = '{{replace:plugins/nexe-daemon/lib/nexe-daemon.js}}'
|
|
||||||
|
|
||||||
return next()
|
|
||||||
}
|
|
||||||
@@ -1,66 +0,0 @@
|
|||||||
const installCommands = ['-i', '--install']
|
|
||||||
const installIndex = process.argv.findIndex(x => installCommands.includes(x))
|
|
||||||
import * as path from 'path'
|
|
||||||
import * as fs from 'fs'
|
|
||||||
import * as cp from 'child_process'
|
|
||||||
|
|
||||||
function mkdirp(r: string, t?: any): any {
|
|
||||||
;(t = t || null), (r = path.resolve(r))
|
|
||||||
try {
|
|
||||||
fs.mkdirSync(r), (t = t || r)
|
|
||||||
} catch (c) {
|
|
||||||
if ('ENOENT' === c.code) (t = mkdirp(path.dirname(r), t)), mkdirp(r, t)
|
|
||||||
else {
|
|
||||||
var i
|
|
||||||
try {
|
|
||||||
i = fs.statSync(r)
|
|
||||||
} catch (r) {
|
|
||||||
throw c
|
|
||||||
}
|
|
||||||
if (!i.isDirectory()) throw c
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return t
|
|
||||||
}
|
|
||||||
|
|
||||||
if (~installIndex) {
|
|
||||||
console.log('DIRECTORY FOUND')
|
|
||||||
const directory = process.argv[installIndex + 1]
|
|
||||||
if (directory) {
|
|
||||||
mkdirp(path.dirname(directory))
|
|
||||||
const filename = path.join(directory, path.basename(process.execPath))
|
|
||||||
const readStream = fs.createReadStream(process.execPath)
|
|
||||||
const writeStream = fs.createWriteStream(filename)
|
|
||||||
|
|
||||||
const onError = function() {
|
|
||||||
readStream.removeAllListeners()
|
|
||||||
writeStream.removeAllListeners()
|
|
||||||
//TODO
|
|
||||||
}
|
|
||||||
|
|
||||||
readStream
|
|
||||||
.on('error', onError)
|
|
||||||
.pipe(writeStream)
|
|
||||||
.on('error', onError)
|
|
||||||
.on('close', () => {
|
|
||||||
const winsw = filename.replace('.exe', '-service.exe')
|
|
||||||
fs.writeFileSync(winsw, fs.readFileSync('./nexe/plugin/daemon/winsw.exe'))
|
|
||||||
fs.writeFileSync(
|
|
||||||
filename.replace('.exe', '-service.xml'),
|
|
||||||
fs.readFileSync('./nexe/plugin/daemon/winsw.xml')
|
|
||||||
)
|
|
||||||
installService(winsw)
|
|
||||||
})
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
console.log('DIRECTORY NOT FOUND')
|
|
||||||
require('./nexe/plugin/daemon/app.js')
|
|
||||||
}
|
|
||||||
|
|
||||||
function installService(filename: string) {
|
|
||||||
cp.exec(filename + ' install', error => {
|
|
||||||
if (error && !error.message.includes('already exists')) {
|
|
||||||
throw error
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}
|
|
||||||
@@ -1,13 +0,0 @@
|
|||||||
{
|
|
||||||
"compilerOptions": {
|
|
||||||
"target": "es5",
|
|
||||||
"module": "commonjs",
|
|
||||||
"lib": [ "es2016" ],
|
|
||||||
"outDir": "lib",
|
|
||||||
"strict": true
|
|
||||||
},
|
|
||||||
"include": [
|
|
||||||
"src/**/*.ts"
|
|
||||||
],
|
|
||||||
"exclude": []
|
|
||||||
}
|
|
||||||
Binary file not shown.
File diff suppressed because it is too large
Load Diff
File diff suppressed because one or more lines are too long
@@ -1,93 +0,0 @@
|
|||||||
import * as fs from 'fs'
|
|
||||||
import * as path from 'path'
|
|
||||||
import * as child from 'child_process'
|
|
||||||
import { createHash } from 'crypto'
|
|
||||||
|
|
||||||
function findNativeModulePath(filePath: string, bindingsArg: string) {
|
|
||||||
const dirname = path.dirname(filePath)
|
|
||||||
const tempFile = Math.random() * 100 + '.js'
|
|
||||||
const tempFilePath = path.join(dirname, tempFile)
|
|
||||||
fs.writeFileSync(
|
|
||||||
tempFilePath,
|
|
||||||
`
|
|
||||||
var bindings = require('bindings');
|
|
||||||
var Module = require('module');
|
|
||||||
var originalRequire = Module.prototype.require;
|
|
||||||
Module.prototype.require = function(path) {
|
|
||||||
const mod = originalRequire.apply(this, arguments);
|
|
||||||
process.stdout.write(path)
|
|
||||||
return mod
|
|
||||||
};
|
|
||||||
bindings('${bindingsArg}')
|
|
||||||
`
|
|
||||||
)
|
|
||||||
//using exec because it can be done sync
|
|
||||||
const nativeFileName = child.execSync('node ' + tempFile, { cwd: dirname }).toString()
|
|
||||||
fs.unlinkSync(tempFilePath)
|
|
||||||
const relativePath = './' + path.relative(dirname, nativeFileName).replace(/\\/g, '/')
|
|
||||||
return relativePath
|
|
||||||
}
|
|
||||||
/**
|
|
||||||
* Traverse all nodes in a file and evaluate usages of the bindings module
|
|
||||||
* handles two common cases
|
|
||||||
*/
|
|
||||||
export class BindingsRewrite {
|
|
||||||
private bindingsIdNodes: any[] = []
|
|
||||||
public nativeModulePaths: string[] = []
|
|
||||||
public rewrite = false
|
|
||||||
|
|
||||||
isRequire(node: any, moduleName: string) {
|
|
||||||
return node.callee.name === 'require' && node.arguments[0].value === moduleName
|
|
||||||
}
|
|
||||||
|
|
||||||
onNode(absolutePath: string, node: any, parent: any) {
|
|
||||||
if (node.type === 'CallExpression') {
|
|
||||||
if (this.isRequire(node, 'bindings') && parent.type === 'VariableDeclarator') {
|
|
||||||
/**
|
|
||||||
* const loadBindings = require('bindings');
|
|
||||||
* -> const loadBindings = String('');
|
|
||||||
*/
|
|
||||||
this.bindingsIdNodes.push(parent.id)
|
|
||||||
node.callee.name = 'String'
|
|
||||||
node.arguments[0].value = ''
|
|
||||||
this.rewrite = true
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
if (this.isRequire(node, 'bindings') && parent.type === 'CallExpression') {
|
|
||||||
/**
|
|
||||||
*const bindings = require('bindings')('native-module')....
|
|
||||||
* -> const bindings = require('./path/to/native/module.node').....
|
|
||||||
*/
|
|
||||||
const bindingsArgNode = parent.arguments[0]
|
|
||||||
if (bindingsArgNode.type === 'Literal') {
|
|
||||||
parent.callee = { type: 'Identifier', name: 'require' }
|
|
||||||
bindingsArgNode.value = findNativeModulePath(absolutePath, bindingsArgNode.value)
|
|
||||||
this.nativeModulePaths.push(bindingsArgNode.value)
|
|
||||||
this.rewrite = true
|
|
||||||
return
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
const bindingsInvocationIdx = this.bindingsIdNodes.findIndex(x => node.callee.name === x.name)
|
|
||||||
|
|
||||||
if (this.bindingsIdNodes[bindingsInvocationIdx]) {
|
|
||||||
/**
|
|
||||||
* const bindings = loadBindings('native-module')
|
|
||||||
* -> const bindings = require('./path/to/native/module.node')
|
|
||||||
*/
|
|
||||||
const bindingsIdNode = this.bindingsIdNodes[bindingsInvocationIdx]
|
|
||||||
const bindingsArgNode = node.arguments[0]
|
|
||||||
this.bindingsIdNodes.splice(bindingsInvocationIdx, 1)
|
|
||||||
|
|
||||||
if (bindingsArgNode.type === 'Literal') {
|
|
||||||
node.callee.name = 'require'
|
|
||||||
bindingsArgNode.value = findNativeModulePath(absolutePath, bindingsArgNode.value)
|
|
||||||
this.nativeModulePaths.push(bindingsArgNode.value)
|
|
||||||
this.rewrite = true
|
|
||||||
return
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,72 +0,0 @@
|
|||||||
import { createHash } from 'crypto'
|
|
||||||
import * as path from 'path'
|
|
||||||
import * as fs from 'fs'
|
|
||||||
|
|
||||||
export interface EmbedNodeModuleOptions {
|
|
||||||
[key: string]: { additionalFiles: string[] } | true
|
|
||||||
}
|
|
||||||
|
|
||||||
function hashName(name: string | Buffer) {
|
|
||||||
return createHash('md5')
|
|
||||||
.update(name)
|
|
||||||
.digest('hex')
|
|
||||||
.toString()
|
|
||||||
.slice(0, 8)
|
|
||||||
}
|
|
||||||
|
|
||||||
export function embedDotNode(
|
|
||||||
options: EmbedNodeModuleOptions,
|
|
||||||
file: { contents: string; absPath: string }
|
|
||||||
) {
|
|
||||||
const contents = fs.readFileSync(file.absPath)
|
|
||||||
const modulePathParts = file.absPath.split(path.sep).reverse()
|
|
||||||
const module = modulePathParts[modulePathParts.findIndex(x => x === 'node_modules') - 1]
|
|
||||||
const bindingName = path.basename(file.absPath)
|
|
||||||
const settings = options[module]
|
|
||||||
const moduleDir = hashName(contents)
|
|
||||||
file.contents = `
|
|
||||||
var fs=require('fs');var path=require('path');var binding='${contents.toString(
|
|
||||||
'base64'
|
|
||||||
)}';function mkdirp(r,t){t=t||null,r=path.resolve(r);try{fs.mkdirSync(r),t=t||r}catch(c){if("ENOENT"===c.code)t=mkdirp(path.dirname(r),t),mkdirp(r,t);else{var i;try{i=fs.statSync(r)}catch(r){throw c}if(!i.isDirectory())throw c}}return t};`
|
|
||||||
|
|
||||||
if (!settings || settings === true) {
|
|
||||||
file.contents += `
|
|
||||||
mkdirp('${moduleDir}');
|
|
||||||
var bindingPath = path.join(process.cwd(), '${moduleDir}', '${bindingName}')
|
|
||||||
|
|
||||||
require('fs').writeFileSync(bindingPath, Buffer.from(binding, 'base64'))
|
|
||||||
process.dlopen(module, bindingPath)
|
|
||||||
`.trim()
|
|
||||||
return {}
|
|
||||||
}
|
|
||||||
|
|
||||||
let depth = 0
|
|
||||||
settings.additionalFiles.forEach(file => {
|
|
||||||
let ownDepth = 0
|
|
||||||
file.split('/').forEach(x => x === '..' && ownDepth++)
|
|
||||||
depth = ownDepth > depth ? ownDepth : depth
|
|
||||||
})
|
|
||||||
let segments = [moduleDir]
|
|
||||||
while (depth--) {
|
|
||||||
segments.push(hashName(moduleDir + depth))
|
|
||||||
}
|
|
||||||
segments.push(bindingName)
|
|
||||||
|
|
||||||
file.contents += `
|
|
||||||
var cwd = process.cwd()
|
|
||||||
var bindingFileParts = ${JSON.stringify(segments)};
|
|
||||||
var bindingFile = path.join.apply(path, [cwd].concat(bindingFileParts));
|
|
||||||
mkdirp(path.dirname(bindingFile));
|
|
||||||
fs.writeFileSync(bindingFile, Buffer.from(binding, 'base64'));
|
|
||||||
${settings.additionalFiles.reduce((code, filename, i) => {
|
|
||||||
const contents = fs.readFileSync(path.join(path.dirname(file.absPath), filename))
|
|
||||||
return (code += `
|
|
||||||
var file${i} = '${contents.toString('base64')}';
|
|
||||||
var filePath${i} = path.join(cwd, bindingFileParts[0], '${filename.split('../').join('')}');
|
|
||||||
mkdirp(path.dirname(filePath${i}));
|
|
||||||
fs.writeFileSync(filePath${i}, Buffer.from(file${i}, 'base64'));
|
|
||||||
`)
|
|
||||||
}, '')};
|
|
||||||
process.dlopen(module, bindingFile)
|
|
||||||
`
|
|
||||||
}
|
|
||||||
@@ -1,70 +0,0 @@
|
|||||||
import { BindingsRewrite } from './bindings-rewrite'
|
|
||||||
import { embedDotNode, EmbedNodeModuleOptions } from './embed-node'
|
|
||||||
|
|
||||||
export interface FuseBoxFile {
|
|
||||||
info: { absPath: string }
|
|
||||||
absPath: string
|
|
||||||
contents: string
|
|
||||||
analysis: {
|
|
||||||
dependencies: string[]
|
|
||||||
requiresRegeneration: boolean
|
|
||||||
}
|
|
||||||
consume(): void
|
|
||||||
loadContents(): void
|
|
||||||
makeAnalysis(
|
|
||||||
parsingOptions?: any,
|
|
||||||
traversalPlugin?: {
|
|
||||||
plugins: Array<{
|
|
||||||
onNode(file: FuseBoxFile, node: any, parent: any): void
|
|
||||||
onEnd(file: FuseBoxFile): void
|
|
||||||
}>
|
|
||||||
}
|
|
||||||
): void
|
|
||||||
}
|
|
||||||
|
|
||||||
export default function(options: EmbedNodeModuleOptions = {}) {
|
|
||||||
return new NativeModulePlugin(options)
|
|
||||||
}
|
|
||||||
|
|
||||||
export class NativeModulePlugin {
|
|
||||||
public test = /node_modules.*(\.js|\.node)$|\.node$/
|
|
||||||
public limit2Project = false
|
|
||||||
private modules: (keyof EmbedNodeModuleOptions)[]
|
|
||||||
|
|
||||||
constructor(public options = {}) {}
|
|
||||||
|
|
||||||
init(context: any) {
|
|
||||||
context.allowExtension('.node')
|
|
||||||
}
|
|
||||||
|
|
||||||
transform(file: FuseBoxFile) {
|
|
||||||
file.loadContents()
|
|
||||||
|
|
||||||
if (file.absPath.endsWith('.node')) {
|
|
||||||
embedDotNode(this.options, file)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
const bindingsRewrite = new BindingsRewrite()
|
|
||||||
|
|
||||||
file.makeAnalysis(null, {
|
|
||||||
plugins: [
|
|
||||||
{
|
|
||||||
onNode(file, node, parent) {
|
|
||||||
bindingsRewrite.onNode(file.absPath, node, parent)
|
|
||||||
},
|
|
||||||
onEnd(file) {
|
|
||||||
if (bindingsRewrite.rewrite) {
|
|
||||||
const index = file.analysis.dependencies.indexOf('bindings')
|
|
||||||
if (~index) {
|
|
||||||
file.analysis.dependencies.splice(index, 1)
|
|
||||||
}
|
|
||||||
file.analysis.dependencies.push(...bindingsRewrite.nativeModulePaths)
|
|
||||||
file.analysis.requiresRegeneration = true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
]
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
export * from './fuse-native-module-plugin'
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
//TODO
|
|
||||||
+176
-120
@@ -1,90 +1,160 @@
|
|||||||
import { dirname, normalize, join } from 'path'
|
import { delimiter, resolve, normalize, join } from 'path'
|
||||||
import { Buffer } from 'buffer'
|
import { Buffer } from 'buffer'
|
||||||
import { createHash } from 'crypto'
|
import { createReadStream, ReadStream } from 'fs'
|
||||||
import { createReadStream } from 'fs'
|
|
||||||
import { Readable } from 'stream'
|
|
||||||
import { spawn } from 'child_process'
|
import { spawn } from 'child_process'
|
||||||
import { Logger, LogStep } from './logger'
|
import { Logger, LogStep } from './logger'
|
||||||
import { readFileAsync, writeFileAsync, pathExistsAsync, dequote, isWindows, bound } from './util'
|
import {
|
||||||
|
readFileAsync,
|
||||||
|
writeFileAsync,
|
||||||
|
pathExistsAsync,
|
||||||
|
statAsync,
|
||||||
|
dequote,
|
||||||
|
isWindows,
|
||||||
|
bound,
|
||||||
|
semverGt,
|
||||||
|
wrap,
|
||||||
|
} from './util'
|
||||||
import { NexeOptions, version } from './options'
|
import { NexeOptions, version } from './options'
|
||||||
import { NexeTarget } from './target'
|
import { NexeTarget } from './target'
|
||||||
import download = require('download')
|
import { PassThrough, Readable, Stream, Transform } from 'stream'
|
||||||
import { getLatestGitRelease } from './releases'
|
import MultiStream = require('multistream')
|
||||||
import { IncomingMessage } from 'http'
|
import { Bundle, toStream } from './fs/bundle'
|
||||||
|
import { File } from 'resolve-dependencies'
|
||||||
|
import { FactoryStream, LazyStream } from 'multistream'
|
||||||
|
|
||||||
const isBsd = Boolean(~process.platform.indexOf('bsd'))
|
const isBsd = Boolean(~process.platform.indexOf('bsd'))
|
||||||
const make = isWindows ? 'vcbuild.bat' : isBsd ? 'gmake' : 'make'
|
const make = isWindows ? 'vcbuild.bat' : isBsd ? 'gmake' : 'make'
|
||||||
const configure = isWindows ? 'configure' : './configure'
|
const configure = isWindows ? 'configure' : './configure'
|
||||||
|
|
||||||
|
type StringReplacer = (match: string) => string
|
||||||
|
|
||||||
export interface NexeFile {
|
export interface NexeFile {
|
||||||
filename: string
|
filename: string
|
||||||
absPath: string
|
absPath: string
|
||||||
contents: string
|
contents: string | Buffer
|
||||||
}
|
}
|
||||||
|
|
||||||
export { NexeOptions }
|
export { NexeOptions }
|
||||||
|
|
||||||
interface NexeHeader {
|
export class NexeError extends Error {
|
||||||
resources: { [key: string]: number[] }
|
constructor(m: string) {
|
||||||
version: string
|
super(m)
|
||||||
|
Object.setPrototypeOf(this, NexeError.prototype)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
export class NexeCompiler<T extends NexeOptions = NexeOptions> {
|
export class NexeCompiler {
|
||||||
|
/**
|
||||||
|
* Epoch of when compilation started
|
||||||
|
*/
|
||||||
private start = Date.now()
|
private start = Date.now()
|
||||||
private env = { ...process.env }
|
private compileStep: LogStep | undefined
|
||||||
private compileStep: LogStep
|
|
||||||
public log = new Logger(this.options.loglevel)
|
public log = new Logger(this.options.loglevel)
|
||||||
|
/**
|
||||||
|
* Copy of process.env
|
||||||
|
*/
|
||||||
|
public env = { ...process.env }
|
||||||
|
/**
|
||||||
|
* Virtual FileSystem
|
||||||
|
*/
|
||||||
|
public bundle: Bundle
|
||||||
|
/**
|
||||||
|
* Root directory for the source of the current build
|
||||||
|
*/
|
||||||
public src: string
|
public src: string
|
||||||
|
/**
|
||||||
|
* In memory files that are being manipulated by the compiler
|
||||||
|
*/
|
||||||
public files: NexeFile[] = []
|
public files: NexeFile[] = []
|
||||||
|
/**
|
||||||
|
* Standalone pieces of code run before the application entrypoint
|
||||||
|
*/
|
||||||
public shims: string[] = []
|
public shims: string[] = []
|
||||||
public input: string
|
/**
|
||||||
public bundledInput?: string
|
* The last shim (defaults to "require('module').runMain()")
|
||||||
|
*/
|
||||||
|
public startup: string = ''
|
||||||
|
/**
|
||||||
|
* The main entrypoint filename for your application - eg. node mainFile.js
|
||||||
|
*/
|
||||||
|
public entrypoint: string | undefined
|
||||||
|
/**
|
||||||
|
* Not used
|
||||||
|
*/
|
||||||
public targets: NexeTarget[]
|
public targets: NexeTarget[]
|
||||||
|
/**
|
||||||
|
* Current target of the compiler
|
||||||
|
*/
|
||||||
public target: NexeTarget
|
public target: NexeTarget
|
||||||
public resources: { bundle: Buffer; index: { [key: string]: number[] } } = {
|
/**
|
||||||
index: {},
|
* Output filename (-o myapp.exe)
|
||||||
bundle: Buffer.from('')
|
*/
|
||||||
}
|
|
||||||
public output = this.options.output
|
public output = this.options.output
|
||||||
private nodeSrcBinPath: string
|
/**
|
||||||
constructor(public options: T) {
|
* Flag to indicate whether or notstdin was used for input
|
||||||
|
*/
|
||||||
|
public stdinUsed = false
|
||||||
|
/**
|
||||||
|
* Path to the configure script
|
||||||
|
*/
|
||||||
|
public configureScript: string
|
||||||
|
/**
|
||||||
|
* The file path of node binary
|
||||||
|
*/
|
||||||
|
public nodeSrcBinPath: string
|
||||||
|
/**
|
||||||
|
* Remote asset path if available
|
||||||
|
*/
|
||||||
|
public remoteAsset: string
|
||||||
|
|
||||||
|
constructor(public options: NexeOptions) {
|
||||||
const { python } = (this.options = options)
|
const { python } = (this.options = options)
|
||||||
|
//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)) {
|
||||||
|
throw new NexeError(`Invalid remote URI scheme (must be http or https): ${options.remote}`)
|
||||||
|
}
|
||||||
|
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')
|
||||||
if (python) {
|
this.bundle = new Bundle(options)
|
||||||
if (isWindows) {
|
if (isWindows) {
|
||||||
this.env.PATH = '"' + dequote(normalize(python)) + '";' + this.env.PATH
|
const originalPath = process.env.PATH
|
||||||
} else {
|
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
|
||||||
addResource(file: string, contents: Buffer) {
|
addResource(absoluteFileName: string, content?: Buffer | string | File) {
|
||||||
const { resources } = this
|
return this.bundle.addResource(absoluteFileName, content)
|
||||||
resources.index[file] = [resources.bundle.byteLength, contents.byteLength]
|
|
||||||
resources.bundle = Buffer.concat([resources.bundle, contents])
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@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 readFileAsync(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)
|
||||||
}
|
}
|
||||||
@@ -98,30 +168,33 @@ export class NexeCompiler<T extends NexeOptions = NexeOptions> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@bound
|
@bound
|
||||||
async replaceInFileAsync(file: string, replace: string | RegExp, value: string) {
|
async replaceInFileAsync(file: string, replace: string | RegExp, value: string | StringReplacer) {
|
||||||
const entry = await this.readFileAsync(file)
|
const entry = await this.readFileAsync(file)
|
||||||
entry.contents = entry.contents.replace(replace, value)
|
entry.contents = entry.contents.toString().replace(replace, value as any)
|
||||||
}
|
}
|
||||||
|
|
||||||
@bound
|
@bound
|
||||||
async setFileContentsAsync(file: string, contents: string) {
|
async setFileContentsAsync(file: string, contents: string | Buffer) {
|
||||||
const entry = await this.readFileAsync(file)
|
const entry = await this.readFileAsync(file)
|
||||||
entry.contents = contents
|
entry.contents = contents
|
||||||
}
|
}
|
||||||
|
|
||||||
quit() {
|
quit(error?: any) {
|
||||||
const time = Date.now() - this.start
|
const time = Date.now() - this.start
|
||||||
this.log.write(`Finished in ${time / 1000}s`)
|
this.log.write(`Finished in ${time / 1000}s`, error ? 'red' : 'green')
|
||||||
return this.log.flush()
|
return this.log.flush()
|
||||||
}
|
}
|
||||||
|
|
||||||
assertBuild() {
|
assertBuild() {
|
||||||
if (!this.options.build) {
|
if (!this.options.build) {
|
||||||
throw new Error('This feature is only available with `--build`')
|
throw new NexeError('This feature is only available with `--build`')
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public getNodeExecutableLocation(target?: NexeTarget) {
|
public getNodeExecutableLocation(target?: NexeTarget) {
|
||||||
|
if (this.options.asset) {
|
||||||
|
return resolve(this.options.cwd, this.options.asset)
|
||||||
|
}
|
||||||
if (target) {
|
if (target) {
|
||||||
return join(this.options.temp, target.toString())
|
return join(this.options.temp, target.toString())
|
||||||
}
|
}
|
||||||
@@ -130,27 +203,27 @@ export class NexeCompiler<T extends NexeOptions = NexeOptions> {
|
|||||||
|
|
||||||
private _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 new Promise((resolve, reject) => {
|
return new Promise<void>((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}`
|
||||||
reject(new Error(error))
|
reject(new NexeError(error))
|
||||||
}
|
}
|
||||||
resolve()
|
resolve()
|
||||||
})
|
})
|
||||||
@@ -158,75 +231,45 @@ export class NexeCompiler<T extends NexeOptions = NexeOptions> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private _configureAsync() {
|
private _configureAsync() {
|
||||||
|
if (isWindows && semverGt(this.target.version, '10.15.99')) {
|
||||||
|
return Promise.resolve()
|
||||||
|
}
|
||||||
return this._runBuildCommandAsync(this.env.PYTHON || 'python', [
|
return this._runBuildCommandAsync(this.env.PYTHON || 'python', [
|
||||||
configure,
|
this.configureScript,
|
||||||
...this.options.configure
|
...this.options.configure,
|
||||||
])
|
])
|
||||||
}
|
}
|
||||||
|
|
||||||
private async _buildAsync() {
|
public async build(): Promise<ReadStream> {
|
||||||
this.compileStep.log(
|
this.compileStep!.log(
|
||||||
`Configuring node build${
|
`Configuring node build${
|
||||||
this.options.configure.length ? ': ' + 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 ? ' 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())
|
||||||
}
|
}
|
||||||
|
|
||||||
private async _fetchPrebuiltBinaryAsync(target: NexeTarget) {
|
private async _shouldCompileBinaryAsync(binary: NodeJS.ReadableStream | null, location: string) {
|
||||||
let downloadOptions = this.options.downloadOptions
|
//SOMEDAY combine make/configure/vcBuild/and modified times of included files
|
||||||
|
const { snapshot, build } = this.options
|
||||||
|
|
||||||
if (this.options.ghToken) {
|
if (!binary) {
|
||||||
downloadOptions = Object.assign({}, downloadOptions)
|
return true
|
||||||
downloadOptions.headers = Object.assign({}, downloadOptions.headers, {
|
|
||||||
Authorization: 'token ' + this.options.ghToken
|
|
||||||
})
|
|
||||||
}
|
}
|
||||||
|
|
||||||
const githubRelease = await getLatestGitRelease(downloadOptions)
|
if (build && snapshot != null && (await pathExistsAsync(snapshot))) {
|
||||||
const assetName = target.toString()
|
const snapshotLastModified = (await statAsync(snapshot)).mtimeMs
|
||||||
const asset = githubRelease.assets.find(x => x.name === assetName)
|
const binaryLastModified = (await statAsync(location)).mtimeMs
|
||||||
|
return snapshotLastModified > binaryLastModified
|
||||||
if (!asset) {
|
|
||||||
throw new Error(`${assetName} not available, create it using the --build flag`)
|
|
||||||
}
|
}
|
||||||
const filename = this.getNodeExecutableLocation(target)
|
|
||||||
|
|
||||||
await download(asset.browser_download_url, dirname(filename), this.options.downloadOptions).on(
|
return false
|
||||||
'response',
|
|
||||||
(res: IncomingMessage) => {
|
|
||||||
const total = +res.headers['content-length']!
|
|
||||||
let current = 0
|
|
||||||
res.on('data', data => {
|
|
||||||
current += data.length
|
|
||||||
this.compileStep.modify(`Downloading...${(current / total * 100).toFixed()}%`)
|
|
||||||
})
|
|
||||||
}
|
|
||||||
)
|
|
||||||
return createReadStream(filename)
|
|
||||||
}
|
|
||||||
|
|
||||||
getHeader() {
|
|
||||||
const version =
|
|
||||||
['configure', 'vcBuild', 'make'].reduce((a, c) => {
|
|
||||||
return (a += (this.options as any)[c]
|
|
||||||
.slice()
|
|
||||||
.sort()
|
|
||||||
.join())
|
|
||||||
}, '') + this.options.enableNodeCli
|
|
||||||
const header = {
|
|
||||||
resources: this.resources.index,
|
|
||||||
version: createHash('md5')
|
|
||||||
.update(version)
|
|
||||||
.digest('hex')
|
|
||||||
}
|
|
||||||
return `process.__nexe=${JSON.stringify(header)};`
|
|
||||||
}
|
}
|
||||||
|
|
||||||
async compileAsync(target: NexeTarget) {
|
async compileAsync(target: NexeTarget) {
|
||||||
@@ -234,39 +277,52 @@ export class NexeCompiler<T extends NexeOptions = NexeOptions> {
|
|||||||
const build = this.options.build
|
const build = this.options.build
|
||||||
const location = this.getNodeExecutableLocation(build ? undefined : target)
|
const location = this.getNodeExecutableLocation(build ? undefined : target)
|
||||||
let binary = (await pathExistsAsync(location)) ? createReadStream(location) : null
|
let binary = (await pathExistsAsync(location)) ? createReadStream(location) : null
|
||||||
if (!build && !binary) {
|
|
||||||
step.modify('Fetching prebuilt binary')
|
if (await this._shouldCompileBinaryAsync(binary, location)) {
|
||||||
binary = await this._fetchPrebuiltBinaryAsync(target)
|
binary = await this.build()
|
||||||
}
|
|
||||||
if (!binary) {
|
|
||||||
binary = await this._buildAsync()
|
|
||||||
step.log('Node binary compiled')
|
step.log('Node binary compiled')
|
||||||
}
|
}
|
||||||
return this._assembleDeliverable(binary)
|
return this._assembleDeliverable(binary!)
|
||||||
}
|
}
|
||||||
|
|
||||||
code() {
|
code() {
|
||||||
return [this.shims.join(''), this.input].join(';')
|
return [this.shims.join(''), this.startup].join(';')
|
||||||
}
|
}
|
||||||
|
|
||||||
private _assembleDeliverable(binary: NodeJS.ReadableStream) {
|
private async _assembleDeliverable(binary: Readable) {
|
||||||
if (this.options.empty) {
|
if (!this.options.mangle) {
|
||||||
return binary
|
return binary
|
||||||
}
|
}
|
||||||
const artifact = new Readable({ read() {} })
|
const launchCode = this.code()
|
||||||
binary.on('data', (chunk: Buffer) => {
|
const codeSize = Buffer.byteLength(launchCode)
|
||||||
artifact.push(chunk)
|
const sentinel = Buffer.from('<nexe~~sentinel>')
|
||||||
|
|
||||||
|
let vfsSize = 0
|
||||||
|
const streams = [
|
||||||
|
binary,
|
||||||
|
toStream(launchCode),
|
||||||
|
this.bundle.toStream().pipe(
|
||||||
|
new Transform({
|
||||||
|
transform: (chunk, _, cb) => {
|
||||||
|
vfsSize || this.bundle.finalize()
|
||||||
|
chunk && (vfsSize += chunk.length)
|
||||||
|
cb(null, chunk)
|
||||||
|
},
|
||||||
|
})
|
||||||
|
),
|
||||||
|
]
|
||||||
|
|
||||||
|
let done = false
|
||||||
|
return new MultiStream((cb) => {
|
||||||
|
if (done) cb(null, null)
|
||||||
|
else if (streams.length) cb(null, streams.shift() as Readable)
|
||||||
|
else {
|
||||||
|
done = true
|
||||||
|
const trailers = Buffer.alloc(16)
|
||||||
|
trailers.writeDoubleLE(codeSize, 0)
|
||||||
|
trailers.writeDoubleLE(vfsSize, 8)
|
||||||
|
cb(null, toStream(Buffer.concat([sentinel, trailers])))
|
||||||
|
}
|
||||||
})
|
})
|
||||||
binary.on('close', () => {
|
|
||||||
const content = this.code()
|
|
||||||
artifact.push(content)
|
|
||||||
artifact.push(this.resources.bundle)
|
|
||||||
const lengths = Buffer.from(Array(16))
|
|
||||||
lengths.writeDoubleLE(Buffer.byteLength(content), 0)
|
|
||||||
lengths.writeDoubleLE(this.resources.bundle.byteLength, 8)
|
|
||||||
artifact.push(Buffer.concat([Buffer.from('<nexe~~sentinel>'), lengths]))
|
|
||||||
artifact.push(null)
|
|
||||||
})
|
|
||||||
return artifact
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,40 @@
|
|||||||
|
# nexe-fs
|
||||||
|
|
||||||
|
### Getting Started:
|
||||||
|
|
||||||
|
This module contains a set of patches used to create (and use) the Nexe Virtual FileSystem
|
||||||
|
|
||||||
|
In order for NVFS to work with node's `require` method. A custom build of node must be used. If using the `nexe` cli this will be handled automatically
|
||||||
|
|
||||||
|
The customization should be applied as early as possbile when node is starting up.
|
||||||
|
|
||||||
|
i.e. The contents of `nexe-fs/bootstrap` should be put [here](https://github.com/nodejs/node/blob/0827c80920311fa9d1e6989c8a73aaaeca962eb7/lib/internal/bootstrap/node.js#L27-L28).
|
||||||
|
|
||||||
|
### Creating a NVFS:
|
||||||
|
|
||||||
|
To create a virtual file system use the `Bundle` Object, in your build process:
|
||||||
|
|
||||||
|
```javascript
|
||||||
|
const { Bundle } = require('nexe-fs')
|
||||||
|
|
||||||
|
const bundle = new Bundle()
|
||||||
|
await bundle.addResource(absoluteFileName)
|
||||||
|
|
||||||
|
bundle.toStream().pipe(fs.createWriteStream('./myFsBlob'))
|
||||||
|
```
|
||||||
|
|
||||||
|
In the entrypoint of your application, the fs patch needs to be applied (executed as early as possible)
|
||||||
|
For example, In the build process, the application's entrypoint could be prepended with the following:
|
||||||
|
|
||||||
|
```javascript
|
||||||
|
const codeToPrependToEntrypoint = fs.readFileSync(require.resolve('nexe-fs/patch'), 'utf-8') + `
|
||||||
|
shimFs({
|
||||||
|
blobPath: 'location/of/myFsBlob',
|
||||||
|
resources: ${JSON.stringify(bundle)},
|
||||||
|
layout: {
|
||||||
|
resourceStart: 0 // the offset within the blob that is referenced by the bundle index
|
||||||
|
}
|
||||||
|
})`
|
||||||
|
```
|
||||||
|
|
||||||
|
Since a custom node build is being used. A great place for this code would be the node source file: `_third_party_main.js`
|
||||||
@@ -0,0 +1,395 @@
|
|||||||
|
import { Libzip } from '@yarnpkg/libzip'
|
||||||
|
import {
|
||||||
|
FakeFS,
|
||||||
|
PortablePath,
|
||||||
|
RmdirOptions,
|
||||||
|
OpendirOptions,
|
||||||
|
BasePortableFakeFS,
|
||||||
|
Dirent,
|
||||||
|
Dir,
|
||||||
|
MkdirOptions,
|
||||||
|
FSPath,
|
||||||
|
ppath,
|
||||||
|
npath,
|
||||||
|
Filename,
|
||||||
|
CustomDir,
|
||||||
|
} from '@yarnpkg/fslib'
|
||||||
|
import { ZipFS, ZipOpenFS } from '@yarnpkg/libzip'
|
||||||
|
import { resolve, toNamespacedPath } from 'path'
|
||||||
|
import { constants } from 'fs'
|
||||||
|
|
||||||
|
export type SnapshotZipFSOptions = {
|
||||||
|
baseFs: FakeFS<PortablePath>
|
||||||
|
libzip: Libzip | (() => Libzip)
|
||||||
|
zipFs: ZipFS
|
||||||
|
root: string
|
||||||
|
}
|
||||||
|
|
||||||
|
const uniqBy = (arr: Array<string | Dirent>, pick: (...arg: any[]) => any) => {
|
||||||
|
const seen = new Set()
|
||||||
|
return arr.filter((x) => {
|
||||||
|
const key = pick(x)
|
||||||
|
if (seen.has(key)) return false
|
||||||
|
seen.add(key)
|
||||||
|
return true
|
||||||
|
})
|
||||||
|
}
|
||||||
|
function uniqReaddir(arr: Array<string | Dirent>) {
|
||||||
|
return uniqBy(arr, (s: string | Dirent) => (typeof s === 'string' ? s : s.name))
|
||||||
|
}
|
||||||
|
|
||||||
|
export class SnapshotZipFS extends BasePortableFakeFS {
|
||||||
|
zipFs: ZipFS
|
||||||
|
baseFs: FakeFS<PortablePath>
|
||||||
|
root: string
|
||||||
|
magic: number
|
||||||
|
constructor(opts: SnapshotZipFSOptions) {
|
||||||
|
super()
|
||||||
|
this.zipFs = opts.zipFs
|
||||||
|
this.baseFs = opts.baseFs
|
||||||
|
this.root = opts.root
|
||||||
|
this.magic = 0x2a << 24
|
||||||
|
}
|
||||||
|
private readonly fdMap: Map<number, [ZipFS, number]> = new Map()
|
||||||
|
private nextFd = 3
|
||||||
|
|
||||||
|
async makeCallPromise<T>(
|
||||||
|
p: FSPath<PortablePath>,
|
||||||
|
discard: () => Promise<T>,
|
||||||
|
accept: (zipFS: ZipFS, zipInfo: { subPath: PortablePath }) => Promise<T>,
|
||||||
|
{ requireSubpath = true }: { requireSubpath?: boolean } = {}
|
||||||
|
): Promise<T> {
|
||||||
|
if (typeof p !== 'string') return await discard()
|
||||||
|
|
||||||
|
const normalizedP = this.resolve(p)
|
||||||
|
|
||||||
|
const zipInfo = this.findZip(normalizedP)
|
||||||
|
if (!zipInfo) return await discard()
|
||||||
|
|
||||||
|
if (requireSubpath && zipInfo.subPath === '/') return await discard()
|
||||||
|
|
||||||
|
return await accept(this.zipFs, zipInfo)
|
||||||
|
}
|
||||||
|
|
||||||
|
makeCallSync<T>(
|
||||||
|
p: FSPath<PortablePath>,
|
||||||
|
discard: () => T,
|
||||||
|
accept: (zipFS: ZipFS, zipInfo: { subPath: PortablePath; archivePath: string }) => T,
|
||||||
|
{ requireSubpath = true }: { requireSubpath?: boolean } = {}
|
||||||
|
): T {
|
||||||
|
if (typeof p !== 'string') return discard()
|
||||||
|
|
||||||
|
const normalizedP = this.resolve(p)
|
||||||
|
|
||||||
|
const zipInfo = this.findZip(normalizedP)
|
||||||
|
if (!zipInfo) return discard()
|
||||||
|
|
||||||
|
if (requireSubpath && zipInfo.subPath === '/') return discard()
|
||||||
|
|
||||||
|
return accept(this.zipFs, { archivePath: '', ...zipInfo })
|
||||||
|
}
|
||||||
|
|
||||||
|
async realpathPromise(p: PortablePath) {
|
||||||
|
return await this.realpathSync(p)
|
||||||
|
}
|
||||||
|
|
||||||
|
realpathSync(p: PortablePath) {
|
||||||
|
return this.makeCallSync(
|
||||||
|
p,
|
||||||
|
() => this.baseFs.realpathSync(p),
|
||||||
|
(zipFs, { subPath }) => {
|
||||||
|
if (zipFs.lstatSync(subPath).isSymbolicLink()) {
|
||||||
|
return zipFs.realpathSync(subPath)
|
||||||
|
} else {
|
||||||
|
// return the original path in case it wasn't under /snapshot, e.g. if it was for a node module - otherwise the node module parent path is the wrong one (and other things resolve relative to that)
|
||||||
|
return p
|
||||||
|
}
|
||||||
|
}
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
findZip(p: PortablePath) {
|
||||||
|
p = this.resolve(p)
|
||||||
|
const snapshotPP = npath.toPortablePath('/snapshot')
|
||||||
|
const pathsToTry = Array.from(
|
||||||
|
new Set([
|
||||||
|
p,
|
||||||
|
resolve('/snapshot', p),
|
||||||
|
ppath.resolve(
|
||||||
|
snapshotPP,
|
||||||
|
npath.toPortablePath(
|
||||||
|
npath.relative(npath.fromPortablePath(this.root), npath.fromPortablePath(p))
|
||||||
|
)
|
||||||
|
),
|
||||||
|
ppath.resolve(
|
||||||
|
snapshotPP,
|
||||||
|
npath.toPortablePath(
|
||||||
|
npath.relative(
|
||||||
|
toNamespacedPath(npath.fromPortablePath(this.root)),
|
||||||
|
toNamespacedPath(npath.fromPortablePath(p))
|
||||||
|
)
|
||||||
|
)
|
||||||
|
),
|
||||||
|
])
|
||||||
|
)
|
||||||
|
for (const path of pathsToTry) {
|
||||||
|
const portablePath = npath.toPortablePath(path)
|
||||||
|
if (this.zipFs.existsSync(portablePath)) {
|
||||||
|
return {
|
||||||
|
subPath: portablePath,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async copyFilePromise(sourceP: PortablePath, destP: PortablePath, flags: number = 0) {
|
||||||
|
const fallback = async (
|
||||||
|
sourceFs: FakeFS<PortablePath>,
|
||||||
|
sourceP: PortablePath,
|
||||||
|
destFs: FakeFS<PortablePath>,
|
||||||
|
destP: PortablePath
|
||||||
|
) => {
|
||||||
|
if ((flags & constants.COPYFILE_FICLONE_FORCE) !== 0)
|
||||||
|
throw Object.assign(
|
||||||
|
new Error(`EXDEV: cross-device clone not permitted, copyfile '${sourceP}' -> ${destP}'`),
|
||||||
|
{ code: `EXDEV` }
|
||||||
|
)
|
||||||
|
if (flags & constants.COPYFILE_EXCL && (await this.existsPromise(sourceP)))
|
||||||
|
throw Object.assign(
|
||||||
|
new Error(`EEXIST: file already exists, copyfile '${sourceP}' -> '${destP}'`),
|
||||||
|
{ code: `EEXIST` }
|
||||||
|
)
|
||||||
|
|
||||||
|
let content
|
||||||
|
try {
|
||||||
|
content = await sourceFs.readFilePromise(sourceP)
|
||||||
|
} catch (error) {
|
||||||
|
throw Object.assign(
|
||||||
|
new Error(`EINVAL: invalid argument, copyfile '${sourceP}' -> '${destP}'`),
|
||||||
|
{ code: `EINVAL` }
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
await destFs.writeFilePromise(destP, content)
|
||||||
|
}
|
||||||
|
|
||||||
|
return await this.makeCallPromise(
|
||||||
|
sourceP,
|
||||||
|
async () => {
|
||||||
|
return await this.baseFs.copyFilePromise(sourceP, destP, flags)
|
||||||
|
},
|
||||||
|
async (zipFsS, { subPath: subPathS }) => {
|
||||||
|
return await fallback(zipFsS, subPathS, this.baseFs, destP)
|
||||||
|
}
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
copyFileSync(sourceP: PortablePath, destP: PortablePath, flags: number = 0) {
|
||||||
|
const fallback = (
|
||||||
|
sourceFs: FakeFS<PortablePath>,
|
||||||
|
sourceP: PortablePath,
|
||||||
|
destFs: FakeFS<PortablePath>,
|
||||||
|
destP: PortablePath
|
||||||
|
) => {
|
||||||
|
if ((flags & constants.COPYFILE_FICLONE_FORCE) !== 0)
|
||||||
|
throw Object.assign(
|
||||||
|
new Error(`EXDEV: cross-device clone not permitted, copyfile '${sourceP}' -> ${destP}'`),
|
||||||
|
{ code: `EXDEV` }
|
||||||
|
)
|
||||||
|
if (flags & constants.COPYFILE_EXCL && this.existsSync(sourceP))
|
||||||
|
throw Object.assign(
|
||||||
|
new Error(`EEXIST: file already exists, copyfile '${sourceP}' -> '${destP}'`),
|
||||||
|
{ code: `EEXIST` }
|
||||||
|
)
|
||||||
|
|
||||||
|
let content
|
||||||
|
try {
|
||||||
|
content = sourceFs.readFileSync(sourceP)
|
||||||
|
} catch (error) {
|
||||||
|
throw Object.assign(
|
||||||
|
new Error(`EINVAL: invalid argument, copyfile '${sourceP}' -> '${destP}'`),
|
||||||
|
{ code: `EINVAL` }
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
destFs.writeFileSync(destP, content)
|
||||||
|
}
|
||||||
|
|
||||||
|
return this.makeCallSync(
|
||||||
|
sourceP,
|
||||||
|
() => {
|
||||||
|
return this.baseFs.copyFileSync(sourceP, destP, flags)
|
||||||
|
},
|
||||||
|
(zipFsS, { subPath: subPathS }) => {
|
||||||
|
return fallback(zipFsS, subPathS, this.baseFs, destP)
|
||||||
|
}
|
||||||
|
)
|
||||||
|
}
|
||||||
|
async readdirPromise(p: PortablePath): Promise<Array<Filename>>
|
||||||
|
async readdirPromise(
|
||||||
|
p: PortablePath,
|
||||||
|
opts: { withFileTypes: false } | null
|
||||||
|
): Promise<Array<Filename>>
|
||||||
|
async readdirPromise(p: PortablePath, opts: { withFileTypes: true }): Promise<Array<Dirent>>
|
||||||
|
async readdirPromise(
|
||||||
|
p: PortablePath,
|
||||||
|
opts: { withFileTypes: boolean }
|
||||||
|
): Promise<Array<Filename> | Array<Dirent>>
|
||||||
|
async readdirPromise(
|
||||||
|
p: PortablePath,
|
||||||
|
opts?: { withFileTypes?: boolean } | null
|
||||||
|
): Promise<Array<string | Dirent>> {
|
||||||
|
const fallback = async () => {
|
||||||
|
return await this.baseFs.readdirPromise(p, opts as any)
|
||||||
|
}
|
||||||
|
return await this.makeCallPromise(
|
||||||
|
p,
|
||||||
|
fallback,
|
||||||
|
async (zipFs, { subPath }) => {
|
||||||
|
const fallbackPaths: Array<string | Dirent> = await fallback().catch(() => [])
|
||||||
|
return Promise.resolve(
|
||||||
|
uniqReaddir(fallbackPaths.concat(await zipFs.readdirPromise(subPath, opts as any)))
|
||||||
|
)
|
||||||
|
},
|
||||||
|
{
|
||||||
|
requireSubpath: false,
|
||||||
|
}
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
readdirSync(p: PortablePath): Array<Filename>
|
||||||
|
readdirSync(p: PortablePath, opts: { withFileTypes: false } | null): Array<Filename>
|
||||||
|
readdirSync(p: PortablePath, opts: { withFileTypes: true }): Array<Dirent>
|
||||||
|
readdirSync(p: PortablePath, opts: { withFileTypes: boolean }): Array<Filename> | Array<Dirent>
|
||||||
|
readdirSync(p: PortablePath, opts?: { withFileTypes?: boolean } | null): Array<string | Dirent> {
|
||||||
|
const fallback = () => {
|
||||||
|
return this.baseFs.readdirSync(p, opts as any)
|
||||||
|
}
|
||||||
|
return this.makeCallSync(
|
||||||
|
p,
|
||||||
|
fallback,
|
||||||
|
(zipFs, { subPath }) => {
|
||||||
|
let fallbackPaths: Array<string | Dirent> = []
|
||||||
|
try {
|
||||||
|
fallbackPaths = fallback()
|
||||||
|
} catch (e) {}
|
||||||
|
return fallbackPaths.concat(uniqReaddir(zipFs.readdirSync(subPath, opts as any)))
|
||||||
|
},
|
||||||
|
{
|
||||||
|
requireSubpath: false,
|
||||||
|
}
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
async mkdirPromise(p: PortablePath, opts?: MkdirOptions) {
|
||||||
|
return await this.baseFs.mkdirPromise(p, opts)
|
||||||
|
}
|
||||||
|
|
||||||
|
mkdirSync(p: PortablePath, opts?: MkdirOptions) {
|
||||||
|
return this.baseFs.mkdirSync(p, opts)
|
||||||
|
}
|
||||||
|
|
||||||
|
async rmdirPromise(p: PortablePath, opts?: RmdirOptions) {
|
||||||
|
return await this.baseFs.rmdirPromise(p, opts)
|
||||||
|
}
|
||||||
|
|
||||||
|
rmdirSync(p: PortablePath, opts?: RmdirOptions) {
|
||||||
|
return this.baseFs.rmdirSync(p, opts)
|
||||||
|
}
|
||||||
|
|
||||||
|
async opendirPromise(p: PortablePath, opts?: OpendirOptions) {
|
||||||
|
return this.opendirSync(p, opts)
|
||||||
|
}
|
||||||
|
|
||||||
|
opendirSync(p: PortablePath, opts?: OpendirOptions) {
|
||||||
|
const zipInfo = this.findZip(p)
|
||||||
|
let zipFsDir: Dir<PortablePath> | null = null
|
||||||
|
if (zipInfo) {
|
||||||
|
zipFsDir = this.zipFs.opendirSync(zipInfo.subPath)
|
||||||
|
}
|
||||||
|
let realFsDir: Dir<PortablePath> | null = null
|
||||||
|
try {
|
||||||
|
realFsDir = this.baseFs.opendirSync(p)
|
||||||
|
} catch (e) {
|
||||||
|
if (!zipFsDir) throw e
|
||||||
|
}
|
||||||
|
const seen = new Set()
|
||||||
|
const nextDirent = () => {
|
||||||
|
const entry = realFsDir?.readSync() || zipFsDir?.readSync()
|
||||||
|
if (entry && !seen.has(entry.name)) {
|
||||||
|
seen.add(entry.name)
|
||||||
|
return entry
|
||||||
|
}
|
||||||
|
return null
|
||||||
|
}
|
||||||
|
|
||||||
|
const onClose = () => {
|
||||||
|
zipFsDir?.closeSync()
|
||||||
|
realFsDir?.closeSync()
|
||||||
|
}
|
||||||
|
|
||||||
|
return new CustomDir(p, nextDirent, { onClose })
|
||||||
|
}
|
||||||
|
|
||||||
|
accessPromise = ZipOpenFS.prototype.accessPromise
|
||||||
|
accessSync = ZipOpenFS.prototype.accessSync
|
||||||
|
appendFilePromise = ZipOpenFS.prototype.appendFilePromise
|
||||||
|
appendFileSync = ZipOpenFS.prototype.appendFileSync
|
||||||
|
chmodPromise = ZipOpenFS.prototype.chmodPromise
|
||||||
|
chmodSync = ZipOpenFS.prototype.chmodSync
|
||||||
|
fchmodPromise = ZipOpenFS.prototype.fchmodPromise
|
||||||
|
fchmodSync = ZipOpenFS.prototype.fchmodSync
|
||||||
|
chownPromise = ZipOpenFS.prototype.chownPromise
|
||||||
|
chownSync = ZipOpenFS.prototype.chownSync
|
||||||
|
fchownPromise = ZipOpenFS.prototype.fchownPromise
|
||||||
|
fchownSync = ZipOpenFS.prototype.fchownSync
|
||||||
|
closePromise = ZipOpenFS.prototype.closePromise
|
||||||
|
closeSync = ZipOpenFS.prototype.closeSync
|
||||||
|
createReadStream = ZipOpenFS.prototype.createReadStream
|
||||||
|
createWriteStream = ZipOpenFS.prototype.createWriteStream
|
||||||
|
existsPromise = ZipOpenFS.prototype.existsPromise
|
||||||
|
existsSync = ZipOpenFS.prototype.existsSync
|
||||||
|
fstatPromise = ZipOpenFS.prototype.fstatPromise
|
||||||
|
fstatSync = ZipOpenFS.prototype.fstatSync
|
||||||
|
getExtractHint = ZipOpenFS.prototype.getExtractHint
|
||||||
|
getRealPath = ZipOpenFS.prototype.getRealPath
|
||||||
|
linkPromise = ZipOpenFS.prototype.linkPromise
|
||||||
|
linkSync = ZipOpenFS.prototype.linkSync
|
||||||
|
lstatPromise = ZipOpenFS.prototype.lstatPromise
|
||||||
|
lstatSync = ZipOpenFS.prototype.lstatSync
|
||||||
|
openPromise = ZipOpenFS.prototype.openPromise
|
||||||
|
openSync = ZipOpenFS.prototype.openSync
|
||||||
|
readFilePromise = ZipOpenFS.prototype.readFilePromise
|
||||||
|
readFileSync = ZipOpenFS.prototype.readFileSync
|
||||||
|
readlinkPromise = ZipOpenFS.prototype.readlinkPromise
|
||||||
|
readlinkSync = ZipOpenFS.prototype.readlinkSync
|
||||||
|
readPromise = ZipOpenFS.prototype.readPromise
|
||||||
|
readSync = ZipOpenFS.prototype.readSync
|
||||||
|
renamePromise = ZipOpenFS.prototype.renamePromise
|
||||||
|
renameSync = ZipOpenFS.prototype.renameSync
|
||||||
|
resolve = ZipOpenFS.prototype.resolve
|
||||||
|
statPromise = ZipOpenFS.prototype.statPromise
|
||||||
|
statSync = ZipOpenFS.prototype.statSync
|
||||||
|
symlinkPromise = ZipOpenFS.prototype.symlinkPromise
|
||||||
|
symlinkSync = ZipOpenFS.prototype.symlinkSync
|
||||||
|
truncatePromise = ZipOpenFS.prototype.truncatePromise
|
||||||
|
truncateSync = ZipOpenFS.prototype.truncateSync
|
||||||
|
ftruncatePromise = ZipOpenFS.prototype.ftruncatePromise
|
||||||
|
ftruncateSync = ZipOpenFS.prototype.ftruncateSync
|
||||||
|
unlinkPromise = ZipOpenFS.prototype.unlinkPromise
|
||||||
|
unlinkSync = ZipOpenFS.prototype.unlinkSync
|
||||||
|
unwatchFile = ZipOpenFS.prototype.unwatchFile
|
||||||
|
utimesPromise = ZipOpenFS.prototype.utimesPromise
|
||||||
|
utimesSync = ZipOpenFS.prototype.utimesSync
|
||||||
|
lutimesPromise = ZipOpenFS.prototype.utimesPromise
|
||||||
|
lutimesSync = ZipOpenFS.prototype.utimesSync
|
||||||
|
watch = ZipOpenFS.prototype.watch
|
||||||
|
watchFile = ZipOpenFS.prototype.watchFile
|
||||||
|
writeFilePromise = ZipOpenFS.prototype.writeFilePromise
|
||||||
|
writeFileSync = ZipOpenFS.prototype.writeFileSync
|
||||||
|
writePromise = ZipOpenFS.prototype.writePromise
|
||||||
|
writeSync = ZipOpenFS.prototype.writeSync
|
||||||
|
|
||||||
|
// @ts-ignore
|
||||||
|
remapFd = ZipOpenFS.prototype.remapFd
|
||||||
|
}
|
||||||
Vendored
+20
@@ -0,0 +1,20 @@
|
|||||||
|
if (true) {
|
||||||
|
const __nexe_patches = (process.nexe = { patches: {} }).patches
|
||||||
|
const slice = [].slice
|
||||||
|
const __nexe_noop_patch = function (original) {
|
||||||
|
const args = slice.call(arguments, 1)
|
||||||
|
return original.apply(this, args)
|
||||||
|
}
|
||||||
|
const __nexe_patch = function (obj, method, patch) {
|
||||||
|
const original = obj[method]
|
||||||
|
if (!original) return
|
||||||
|
__nexe_patches[method] = patch
|
||||||
|
obj[method] = function() {
|
||||||
|
const args = [original].concat(slice.call(arguments))
|
||||||
|
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)
|
||||||
|
}
|
||||||
@@ -0,0 +1,51 @@
|
|||||||
|
import { relative } from 'path'
|
||||||
|
import { Readable } from 'stream'
|
||||||
|
import { File } from 'resolve-dependencies'
|
||||||
|
import archiver from 'archiver'
|
||||||
|
|
||||||
|
function makeRelativeToZip(cwd: string, path: string) {
|
||||||
|
return '/snapshot/' + relative(cwd, path)
|
||||||
|
}
|
||||||
|
|
||||||
|
export function toStream(content: Buffer | string) {
|
||||||
|
const readable = new Readable({
|
||||||
|
read() {
|
||||||
|
this.push(content)
|
||||||
|
this.push(null)
|
||||||
|
},
|
||||||
|
})
|
||||||
|
return readable
|
||||||
|
}
|
||||||
|
export class Bundle {
|
||||||
|
cwd: string
|
||||||
|
files = new Set<string>()
|
||||||
|
zip: any
|
||||||
|
constructor({ cwd }: { cwd: string } = { cwd: process.cwd() }) {
|
||||||
|
this.cwd = cwd
|
||||||
|
this.zip = archiver('zip')
|
||||||
|
}
|
||||||
|
|
||||||
|
get list() {
|
||||||
|
return Array.from(this.files)
|
||||||
|
}
|
||||||
|
|
||||||
|
public addResource(absoluteFileName: string, content?: File | Buffer | string) {
|
||||||
|
const destPath = makeRelativeToZip(this.cwd, absoluteFileName)
|
||||||
|
if (!this.files.has(destPath)) {
|
||||||
|
if (content == null) {
|
||||||
|
this.zip.file(absoluteFileName, { name: destPath })
|
||||||
|
} else {
|
||||||
|
this.zip.append(content, { name: destPath })
|
||||||
|
}
|
||||||
|
this.files.add(destPath)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public finalize() {
|
||||||
|
return this.zip.finalize()
|
||||||
|
}
|
||||||
|
|
||||||
|
public toStream(): Readable {
|
||||||
|
return this.zip
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -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"
|
||||||
|
}
|
||||||
+112
@@ -0,0 +1,112 @@
|
|||||||
|
import { ZipFS, getLibzipSync } from '@yarnpkg/libzip'
|
||||||
|
import { patchFs, npath, PosixFS, NodeFS } from '@yarnpkg/fslib'
|
||||||
|
import { SnapshotZipFS } from './SnapshotZipFS'
|
||||||
|
import * as assert from 'assert'
|
||||||
|
import * as constants from 'constants'
|
||||||
|
import { dirname } from 'path'
|
||||||
|
|
||||||
|
export interface NexeHeader {
|
||||||
|
blobPath: string
|
||||||
|
layout: {
|
||||||
|
resourceStart: number
|
||||||
|
resourceSize: number
|
||||||
|
contentSize: number
|
||||||
|
contentStart: number
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
let originalFsMethods: any = null
|
||||||
|
let lazyRestoreFs = () => {}
|
||||||
|
const patches = (process as any).nexe.patches || {}
|
||||||
|
const originalPatches = { ...patches }
|
||||||
|
delete (process as any).nexe
|
||||||
|
|
||||||
|
function shimFs(binary: NexeHeader, fs: typeof import('fs') = require('fs')) {
|
||||||
|
if (originalFsMethods !== null) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
originalFsMethods = Object.assign({}, fs)
|
||||||
|
|
||||||
|
const realFs: typeof fs = { ...fs }
|
||||||
|
const nodeFs = new NodeFS(realFs)
|
||||||
|
|
||||||
|
const blob = Buffer.allocUnsafe(binary.layout.resourceSize)
|
||||||
|
const blobFd = realFs.openSync(binary.blobPath, 'r')
|
||||||
|
const bytesRead = realFs.readSync(
|
||||||
|
blobFd,
|
||||||
|
blob,
|
||||||
|
0,
|
||||||
|
binary.layout.resourceSize,
|
||||||
|
binary.layout.resourceStart
|
||||||
|
)
|
||||||
|
assert.equal(bytesRead, binary.layout.resourceSize)
|
||||||
|
|
||||||
|
const zipFs = new ZipFS(blob, { readOnly: true })
|
||||||
|
const snapshotZipFS = new SnapshotZipFS({
|
||||||
|
libzip: getLibzipSync(),
|
||||||
|
zipFs,
|
||||||
|
baseFs: nodeFs,
|
||||||
|
root: dirname(process.argv[0]),
|
||||||
|
})
|
||||||
|
const posixSnapshotZipFs = new PosixFS(snapshotZipFS)
|
||||||
|
patchFs(fs, posixSnapshotZipFs)
|
||||||
|
|
||||||
|
let log = (_: string) => true
|
||||||
|
if ((process.env.DEBUG || '').toLowerCase().includes('nexe:require')) {
|
||||||
|
process.stderr.write(
|
||||||
|
// @ts-ignore
|
||||||
|
`[nexe] - FILES ${JSON.stringify(Array.from(zipFs.entries.keys()), null, 4)}\n`
|
||||||
|
)
|
||||||
|
process.stderr.write(
|
||||||
|
// @ts-ignore
|
||||||
|
`[nexe] - DIRECTORIES ${JSON.stringify(Array.from(zipFs.listings.keys()), null, 4)}\n`
|
||||||
|
)
|
||||||
|
log = (text: string) => {
|
||||||
|
return process.stderr.write(`[nexe] - ${text}\n`)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
function internalModuleReadFile(this: any, original: any, ...args: any[]) {
|
||||||
|
log(`internalModuleReadFile ${args[0]}`)
|
||||||
|
try {
|
||||||
|
return posixSnapshotZipFs.readFileSync(args[0], 'utf-8')
|
||||||
|
} catch (e) {
|
||||||
|
return ''
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (patches.internalModuleReadFile) {
|
||||||
|
patches.internalModuleReadFile = internalModuleReadFile
|
||||||
|
}
|
||||||
|
let returningArray: boolean
|
||||||
|
patches.internalModuleReadJSON = function (this: any, original: any, ...args: any[]) {
|
||||||
|
if (returningArray == null) returningArray = Array.isArray(original.call(this, ''))
|
||||||
|
const res = internalModuleReadFile.call(this, original, ...args)
|
||||||
|
return returningArray && !Array.isArray(res)
|
||||||
|
? res === ''
|
||||||
|
? []
|
||||||
|
: [res, /"(main|name|type|exports|imports)"/.test(res)]
|
||||||
|
: res
|
||||||
|
}
|
||||||
|
patches.internalModuleStat = function (this: any, original: any, ...args: any[]) {
|
||||||
|
log(`internalModuleStat ${args[0]}`)
|
||||||
|
try {
|
||||||
|
const stat = posixSnapshotZipFs.statSync(args[0])
|
||||||
|
if (stat.isDirectory()) return 1
|
||||||
|
return 0
|
||||||
|
} catch (e) {
|
||||||
|
return -constants.ENOENT
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
lazyRestoreFs = () => {
|
||||||
|
Object.assign(fs, originalFsMethods)
|
||||||
|
Object.assign(patches, originalPatches)
|
||||||
|
lazyRestoreFs = () => {}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function restoreFs() {
|
||||||
|
lazyRestoreFs()
|
||||||
|
}
|
||||||
|
|
||||||
|
export { shimFs, restoreFs }
|
||||||
+5
-5
@@ -1,5 +1,5 @@
|
|||||||
import colors = require('chalk')
|
import colors from 'chalk'
|
||||||
import ora = require('ora')
|
import ora from 'ora'
|
||||||
|
|
||||||
const frameLength = 120
|
const frameLength = 120
|
||||||
|
|
||||||
@@ -24,7 +24,7 @@ export class Logger {
|
|||||||
this.ora = ora({
|
this.ora = ora({
|
||||||
text: 'Starting...',
|
text: 'Starting...',
|
||||||
color: 'blue',
|
color: 'blue',
|
||||||
spinner: 'dots'
|
spinner: 'dots',
|
||||||
})
|
})
|
||||||
this.ora.stop()
|
this.ora.stop()
|
||||||
}
|
}
|
||||||
@@ -35,7 +35,7 @@ export class Logger {
|
|||||||
|
|
||||||
flush() {
|
flush() {
|
||||||
!this.silent && this.ora.succeed()
|
!this.silent && this.ora.succeed()
|
||||||
return new Promise(resolve => setTimeout(resolve, frameLength))
|
return new Promise((resolve) => setTimeout(resolve, frameLength))
|
||||||
}
|
}
|
||||||
|
|
||||||
_write(update: string, color = 'green') {
|
_write(update: string, color = 'green') {
|
||||||
@@ -66,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
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+21
-31
@@ -1,10 +1,9 @@
|
|||||||
import { EOL } from 'os'
|
import { EOL } from 'os'
|
||||||
import { compose, Middleware } from 'app-builder'
|
import { compose } from 'app-builder'
|
||||||
import { rimrafAsync } from './util'
|
import { NexeCompiler, NexeError } from './compiler'
|
||||||
import { NexeTarget } from './target'
|
|
||||||
import { NexeCompiler } from './compiler'
|
|
||||||
import { normalizeOptions, NexeOptions, NexePatch } from './options'
|
import { normalizeOptions, NexeOptions, NexePatch } from './options'
|
||||||
import resource from './steps/resource'
|
import resource from './steps/resource'
|
||||||
|
import clean from './steps/clean'
|
||||||
import cli from './steps/cli'
|
import cli from './steps/cli'
|
||||||
import bundle from './steps/bundle'
|
import bundle from './steps/bundle'
|
||||||
import download from './steps/download'
|
import download from './steps/download'
|
||||||
@@ -16,42 +15,33 @@ async function compile(
|
|||||||
compilerOptions?: Partial<NexeOptions>,
|
compilerOptions?: Partial<NexeOptions>,
|
||||||
callback?: (err: Error | null) => void
|
callback?: (err: Error | null) => void
|
||||||
) {
|
) {
|
||||||
const options = normalizeOptions(compilerOptions)
|
let error: Error | null = null,
|
||||||
const compiler = new NexeCompiler(options)
|
options: NexeOptions | null = null,
|
||||||
const build = compiler.options.build
|
compiler: NexeCompiler | null = null
|
||||||
|
|
||||||
if (options.clean) {
|
|
||||||
let path = compiler.src
|
|
||||||
if (!options.build) {
|
|
||||||
path = compiler.getNodeExecutableLocation(compiler.options.targets[0] as NexeTarget)
|
|
||||||
}
|
|
||||||
const step = compiler.log.step('Cleaning up nexe build artifacts...')
|
|
||||||
step.log(`Deleting contents at: ${path}`)
|
|
||||||
await rimrafAsync(path)
|
|
||||||
step.log(`Deleted contents at: ${path}`)
|
|
||||||
return compiler.quit()
|
|
||||||
}
|
|
||||||
|
|
||||||
const buildSteps = build
|
|
||||||
? [download, artifacts, ...patches, ...(options.patches as NexePatch[])]
|
|
||||||
: []
|
|
||||||
const nexe = compose(resource, bundle, shim, cli, buildSteps, options.plugins as NexePatch[])
|
|
||||||
let error = null
|
|
||||||
|
|
||||||
try {
|
try {
|
||||||
await nexe(compiler)
|
options = normalizeOptions(compilerOptions)
|
||||||
} catch (e) {
|
compiler = new NexeCompiler(options)
|
||||||
|
await compose(
|
||||||
|
clean,
|
||||||
|
resource,
|
||||||
|
cli,
|
||||||
|
bundle,
|
||||||
|
shim,
|
||||||
|
download,
|
||||||
|
options.build ? [artifacts, ...patches, ...(options.patches as NexePatch[])] : [],
|
||||||
|
options.plugins as NexePatch[]
|
||||||
|
)(compiler)
|
||||||
|
} catch (e: any) {
|
||||||
error = e
|
error = e
|
||||||
}
|
}
|
||||||
|
|
||||||
if (error) {
|
if (error) {
|
||||||
if (compiler.options.loglevel !== 'silent' && error) {
|
compiler && compiler.quit(error)
|
||||||
process.stderr.write(EOL + error.stack + EOL)
|
|
||||||
}
|
|
||||||
compiler.quit()
|
|
||||||
if (callback) return callback(error)
|
if (callback) return callback(error)
|
||||||
return Promise.reject(error)
|
return Promise.reject(error)
|
||||||
}
|
}
|
||||||
|
|
||||||
if (callback) callback(null)
|
if (callback) callback(null)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+98
-66
@@ -1,14 +1,15 @@
|
|||||||
import * as parseArgv from 'minimist'
|
import parseArgv from 'minimist'
|
||||||
import { NexeCompiler } from './compiler'
|
import { NexeCompiler, NexeError } from './compiler'
|
||||||
import { isWindows, padRight } from './util'
|
import { isWindows, STDIN_FLAG } from './util'
|
||||||
import { basename, extname, join, isAbsolute, relative, dirname, resolve } from 'path'
|
import { basename, extname, join, isAbsolute, resolve } from 'path'
|
||||||
import { getTarget, NexeTarget } from './target'
|
import { getTarget, NexeTarget } from './target'
|
||||||
import { EOL, homedir } from 'os'
|
import { EOL, homedir } from 'os'
|
||||||
import * as c from 'chalk'
|
import chalk from 'chalk'
|
||||||
|
import { resolveSync } from 'resolve-dependencies'
|
||||||
const caw = require('caw')
|
const caw = require('caw')
|
||||||
|
const c = process.platform === 'win32' ? chalk.constructor({ enabled: false }) : chalk
|
||||||
|
|
||||||
export const version = '{{replace:0}}'
|
export const version = '{{ version }}'
|
||||||
|
|
||||||
export interface NexePatch {
|
export interface NexePatch {
|
||||||
(compiler: NexeCompiler, next: () => Promise<void>): Promise<void>
|
(compiler: NexeCompiler, next: () => Promise<void>): Promise<void>
|
||||||
@@ -20,7 +21,10 @@ export interface NexeOptions {
|
|||||||
output: string
|
output: string
|
||||||
targets: (string | NexeTarget)[]
|
targets: (string | NexeTarget)[]
|
||||||
name: string
|
name: string
|
||||||
|
remote: string
|
||||||
|
asset: string
|
||||||
cwd: string
|
cwd: string
|
||||||
|
fs: boolean | string[]
|
||||||
flags: string[]
|
flags: string[]
|
||||||
configure: string[]
|
configure: string[]
|
||||||
vcBuild: string[]
|
vcBuild: string[]
|
||||||
@@ -34,7 +38,7 @@ export interface NexeOptions {
|
|||||||
patches: (string | NexePatch)[]
|
patches: (string | NexePatch)[]
|
||||||
plugins: (string | NexePatch)[]
|
plugins: (string | NexePatch)[]
|
||||||
native: any
|
native: any
|
||||||
empty: boolean
|
mangle: boolean
|
||||||
ghToken: string
|
ghToken: string
|
||||||
sourceUrl?: string
|
sourceUrl?: string
|
||||||
enableStdIn?: boolean
|
enableStdIn?: boolean
|
||||||
@@ -47,7 +51,6 @@ export interface NexeOptions {
|
|||||||
ico?: string
|
ico?: string
|
||||||
debugBundle?: boolean
|
debugBundle?: boolean
|
||||||
warmup?: string
|
warmup?: string
|
||||||
compress?: boolean
|
|
||||||
clean?: boolean
|
clean?: boolean
|
||||||
/**
|
/**
|
||||||
* Api Only
|
* Api Only
|
||||||
@@ -58,26 +61,28 @@ export interface NexeOptions {
|
|||||||
const defaults = {
|
const defaults = {
|
||||||
flags: [],
|
flags: [],
|
||||||
cwd: process.cwd(),
|
cwd: process.cwd(),
|
||||||
|
fs: true,
|
||||||
configure: [],
|
configure: [],
|
||||||
|
mangle: true,
|
||||||
make: [],
|
make: [],
|
||||||
targets: [],
|
targets: [],
|
||||||
vcBuild: isWindows ? ['nosign', 'release'] : [],
|
vcBuild: isWindows ? ['nosign', 'release'] : [],
|
||||||
enableNodeCli: false,
|
enableNodeCli: false,
|
||||||
compress: 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 = {
|
const alias = {
|
||||||
i: 'input',
|
i: 'input',
|
||||||
o: 'output',
|
o: 'output',
|
||||||
v: 'version',
|
v: 'version',
|
||||||
|
a: 'asset',
|
||||||
t: 'target',
|
t: 'target',
|
||||||
b: 'build',
|
b: 'build',
|
||||||
n: 'name',
|
n: 'name',
|
||||||
r: 'resource',
|
r: 'resource',
|
||||||
a: 'resource',
|
|
||||||
p: 'python',
|
p: 'python',
|
||||||
f: 'flag',
|
f: 'flag',
|
||||||
c: 'configure',
|
c: 'configure',
|
||||||
@@ -85,10 +90,9 @@ const alias = {
|
|||||||
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, enableStdIn: true } })
|
const argv = parseArgv(process.argv, { alias, default: { ...defaults } })
|
||||||
const g = c.gray
|
|
||||||
let help = `
|
let help = `
|
||||||
${c.bold('nexe <entry-file> [options]')}
|
${c.bold('nexe <entry-file> [options]')}
|
||||||
|
|
||||||
@@ -99,15 +103,18 @@ ${c.bold('nexe <entry-file> [options]')}
|
|||||||
-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 files (glob) within the binary
|
-r --resource -- *embed files (glob) within the binary
|
||||||
|
--remote -- alternate location (URL) to download pre-built base (nexe) binaries from
|
||||||
--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 -- python2 (as python) executable path
|
-p --python -- python3 (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 -- module with middleware default export for adding a build patch
|
||||||
|
--no-mangle -- used when generating base binaries, or when patching _third_party_main manually
|
||||||
--snapshot -- path to a warmup snapshot
|
--snapshot -- path to a warmup snapshot
|
||||||
--ico -- file name for alternate icon file (windows)
|
--ico -- file name for alternate icon file (windows)
|
||||||
--rc-* -- populate rc file options (windows)
|
--rc-* -- populate rc file options (windows)
|
||||||
@@ -128,7 +135,7 @@ ${c.bold('nexe <entry-file> [options]')}
|
|||||||
help = EOL + help + 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)
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -139,23 +146,13 @@ function flatten(...args: any[]): string[] {
|
|||||||
*/
|
*/
|
||||||
function extractCliMap(match: RegExp, options: any) {
|
function extractCliMap(match: RegExp, options: any) {
|
||||||
return Object.keys(options)
|
return Object.keys(options)
|
||||||
.filter(x => match.test(x))
|
.filter((x) => match.test(x))
|
||||||
.reduce((map: { [key: string]: string }, option: keyof NexeOptions) => {
|
.reduce((map: any, option: any) => {
|
||||||
const key = option.split('-')[1]
|
const key = option.split('-')[1]
|
||||||
map[key] = options[option]
|
map[key] = options[option]
|
||||||
delete options[option]
|
delete options[option]
|
||||||
return map
|
return map
|
||||||
}, {})
|
}, {} as any)
|
||||||
}
|
|
||||||
|
|
||||||
function tryResolveMainFileName(cwd: string) {
|
|
||||||
let filename
|
|
||||||
try {
|
|
||||||
const file = require.resolve(cwd)
|
|
||||||
filename = basename(file).replace(extname(file), '')
|
|
||||||
} catch (_) {}
|
|
||||||
|
|
||||||
return filename ? filename : 'nexe_' + Date.now()
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function extractLogLevel(options: NexeOptions) {
|
function extractLogLevel(options: NexeOptions) {
|
||||||
@@ -166,19 +163,16 @@ function extractLogLevel(options: NexeOptions) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function isName(name: string) {
|
function isName(name: string) {
|
||||||
return name && name !== 'index'
|
return name && name !== 'index' && name !== STDIN_FLAG
|
||||||
}
|
}
|
||||||
|
|
||||||
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
|
||||||
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
|
||||||
if (!isName(name)) {
|
|
||||||
name = tryResolveMainFileName(options.cwd)
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!isName(name) && basename(options.cwd)) {
|
if (!isName(name) && basename(options.cwd)) {
|
||||||
name = basename(options.cwd)
|
name = basename(options.cwd)
|
||||||
}
|
}
|
||||||
@@ -186,27 +180,53 @@ function extractName(options: NexeOptions) {
|
|||||||
return name.replace(/\.exe$/, '')
|
return name.replace(/\.exe$/, '')
|
||||||
}
|
}
|
||||||
|
|
||||||
function isEntryFile(filename?: string): filename is string {
|
function padRelative(input: string) {
|
||||||
return Boolean(
|
let prefix = ''
|
||||||
filename && !isAbsolute(filename) && filename !== 'node' && /\.(tsx?|jsx?)$/.test(filename)
|
if (!input.startsWith('.')) {
|
||||||
)
|
prefix = './'
|
||||||
|
}
|
||||||
|
return prefix + input
|
||||||
}
|
}
|
||||||
|
|
||||||
export function resolveEntry(input: string, cwd: string, maybeEntry?: string) {
|
function isEntryFile(filename?: string): filename is string {
|
||||||
|
return Boolean(filename && !isAbsolute(filename))
|
||||||
|
}
|
||||||
|
|
||||||
|
export function resolveEntry(
|
||||||
|
input: string,
|
||||||
|
cwd: string,
|
||||||
|
maybeEntry: string | undefined,
|
||||||
|
bundle: boolean | string
|
||||||
|
) {
|
||||||
|
let result = null
|
||||||
|
if (input === '-' || maybeEntry === '-') {
|
||||||
|
return STDIN_FLAG
|
||||||
|
}
|
||||||
|
if (input && isAbsolute(input)) {
|
||||||
|
return input
|
||||||
|
}
|
||||||
if (input) {
|
if (input) {
|
||||||
return resolve(cwd, input)
|
const inputPath = padRelative(input)
|
||||||
|
result = resolveSync(cwd, inputPath)
|
||||||
}
|
}
|
||||||
if (isEntryFile(maybeEntry)) {
|
if (isEntryFile(maybeEntry) && (!result || !result.absPath)) {
|
||||||
return resolve(cwd, maybeEntry)
|
const inputPath = padRelative(maybeEntry)
|
||||||
|
result = resolveSync(cwd, inputPath)
|
||||||
}
|
}
|
||||||
if (!process.stdin.isTTY) {
|
if (!process.stdin.isTTY && (!result || !result.absPath) && bundle === defaults.bundle) {
|
||||||
return ''
|
return STDIN_FLAG
|
||||||
}
|
}
|
||||||
try {
|
if (!result || !result.absPath) {
|
||||||
return require.resolve(cwd)
|
result = resolveSync(cwd, '.')
|
||||||
} catch (e) {
|
|
||||||
throw new Error('No entry file found')
|
|
||||||
}
|
}
|
||||||
|
if (!result.absPath) {
|
||||||
|
throw new NexeError(`Entry file "${input || ''}" not found!`)
|
||||||
|
}
|
||||||
|
return result.absPath
|
||||||
|
}
|
||||||
|
|
||||||
|
function isCli(options?: Partial<NexeOptions>) {
|
||||||
|
return argv === options
|
||||||
}
|
}
|
||||||
|
|
||||||
function normalizeOptions(input?: Partial<NexeOptions>): NexeOptions {
|
function normalizeOptions(input?: Partial<NexeOptions>): NexeOptions {
|
||||||
@@ -216,8 +236,9 @@ function normalizeOptions(input?: Partial<NexeOptions>): NexeOptions {
|
|||||||
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')
|
||||||
const maybeEntry = input === argv ? argv._[argv._.length - 1] : undefined
|
const maybeEntry = isCli(input) ? argv._[argv._.length - 1] : undefined
|
||||||
options.input = resolveEntry(options.input, cwd, maybeEntry)
|
options.input = resolveEntry(options.input, cwd, maybeEntry, options.bundle)
|
||||||
|
options.enableStdIn = isCli(input) && options.input === STDIN_FLAG
|
||||||
options.name = extractName(options)
|
options.name = extractName(options)
|
||||||
options.loglevel = extractLogLevel(options)
|
options.loglevel = extractLogLevel(options)
|
||||||
options.flags = flatten(opts.flag, options.flags)
|
options.flags = flatten(opts.flag, options.flags)
|
||||||
@@ -226,17 +247,23 @@ function normalizeOptions(input?: Partial<NexeOptions>): NexeOptions {
|
|||||||
options.targets.push(getTarget())
|
options.targets.push(getTarget())
|
||||||
}
|
}
|
||||||
options.ghToken = options.ghToken || process.env.GITHUB_TOKEN || ''
|
options.ghToken = options.ghToken || process.env.GITHUB_TOKEN || ''
|
||||||
options.make = flatten(options.vcBuild, options.make)
|
options.make = flatten(isWindows ? options.vcBuild : options.make)
|
||||||
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 || require('https').globalAgent
|
: options.downloadOptions.agent || require('https').globalAgent
|
||||||
options.downloadOptions.rejectUnauthorized = process.env.HTTPS_PROXY ? false : true
|
options.downloadOptions.rejectUnauthorized = process.env.NODE_TLS_REJECT_UNAUTHORIZED
|
||||||
|
? false
|
||||||
|
: true
|
||||||
|
|
||||||
options.rc = options.rc || extractCliMap(/^rc-.*/, options)
|
options.rc = options.rc || extractCliMap(/^rc-.*/, options)
|
||||||
options.output =
|
options.output =
|
||||||
@@ -245,6 +272,21 @@ function normalizeOptions(input?: Partial<NexeOptions>): NexeOptions {
|
|||||||
: `${options.output || options.name}`
|
: `${options.output || options.name}`
|
||||||
options.output = resolve(cwd, options.output)
|
options.output = resolve(cwd, options.output)
|
||||||
|
|
||||||
|
const requireDefault = (x: string) => {
|
||||||
|
if (typeof x === 'string') {
|
||||||
|
return require(x).default
|
||||||
|
}
|
||||||
|
return x
|
||||||
|
}
|
||||||
|
|
||||||
|
options.mangle = 'mangle' in opts ? opts.mangle : true
|
||||||
|
options.plugins = flatten(opts.plugin, options.plugins).map(requireDefault)
|
||||||
|
options.patches = flatten(opts.patch, options.patches).map(requireDefault)
|
||||||
|
|
||||||
|
if ((!options.mangle && !options.bundle) || options.patches.length) {
|
||||||
|
options.build = true
|
||||||
|
}
|
||||||
|
|
||||||
if (options.build) {
|
if (options.build) {
|
||||||
const { arch } = options.targets[0] as NexeTarget
|
const { arch } = options.targets[0] as NexeTarget
|
||||||
if (isWindows) {
|
if (isWindows) {
|
||||||
@@ -254,19 +296,9 @@ function normalizeOptions(input?: Partial<NexeOptions>): NexeOptions {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
const requireDefault = (x: string) => {
|
|
||||||
if (typeof x === 'string') {
|
|
||||||
return require(x).default
|
|
||||||
}
|
|
||||||
return x
|
|
||||||
}
|
|
||||||
|
|
||||||
options.plugins = flatten(opts.plugin, options.plugins).map(requireDefault)
|
|
||||||
options.patches = flatten(opts.patch, options.patches).map(requireDefault)
|
|
||||||
|
|
||||||
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
|
||||||
}
|
}
|
||||||
|
|||||||
+26
-22
@@ -1,53 +1,57 @@
|
|||||||
const fs = require('fs')
|
const fs = require('fs'),
|
||||||
const fd = fs.openSync(process.execPath, 'r')
|
fd = fs.openSync(process.execPath, 'r'),
|
||||||
const stat = fs.statSync(process.execPath)
|
stat = fs.statSync(process.execPath),
|
||||||
const footer = Buffer.from(Array(32))
|
tailSize = Math.min(stat.size, 16000),
|
||||||
|
tailWindow = Buffer.from(Array(tailSize))
|
||||||
|
|
||||||
fs.readSync(fd, footer, 0, 32, stat.size - 32)
|
fs.readSync(fd, tailWindow, 0, tailSize, stat.size - tailSize)
|
||||||
|
|
||||||
if (!footer.slice(0, 16).equals(Buffer.from('<nexe~~sentinel>'))) {
|
const footerPosition = tailWindow.indexOf('<nexe~~sentinel>')
|
||||||
|
if (footerPosition == -1) {
|
||||||
throw 'Invalid Nexe binary'
|
throw 'Invalid Nexe binary'
|
||||||
}
|
}
|
||||||
|
|
||||||
const contentSize = footer.readDoubleLE(16)
|
const footer = tailWindow.slice(footerPosition, footerPosition + 32),
|
||||||
const resourceSize = footer.readDoubleLE(24)
|
contentSize = footer.readDoubleLE(16),
|
||||||
const contentStart = stat.size - 32 - resourceSize - contentSize
|
resourceSize = footer.readDoubleLE(24),
|
||||||
const resourceStart = contentStart + contentSize
|
contentStart = stat.size - tailSize + footerPosition - resourceSize - contentSize,
|
||||||
|
resourceStart = contentStart + contentSize
|
||||||
|
|
||||||
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('__nexe cannot be reconfigured')
|
throw new Error('This property is readonly')
|
||||||
}
|
}
|
||||||
nexeHeader = Object.assign({}, value, {
|
nexeHeader = Object.assign({}, value, {
|
||||||
|
blobPath: process.execPath,
|
||||||
layout: {
|
layout: {
|
||||||
stat,
|
stat,
|
||||||
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)),
|
||||||
|
Module = require('module')
|
||||||
|
|
||||||
fs.readSync(fd, contentBuffer, 0, contentSize, contentStart)
|
fs.readSync(fd, contentBuffer, 0, contentSize, contentStart)
|
||||||
fs.closeSync(fd)
|
fs.closeSync(fd)
|
||||||
const Module = require('module')
|
|
||||||
process.mainModule = new Module(process.execPath, null)
|
new Module(process.execPath, null)._compile(contentBuffer.toString(), process.execPath)
|
||||||
process.mainModule!.loaded = true
|
|
||||||
;(process.mainModule as any)._compile(contentBuffer.toString(), process.execPath)
|
|
||||||
|
|||||||
@@ -1,20 +1,44 @@
|
|||||||
import { NexeCompiler } from '../compiler'
|
import { NexeCompiler } from '../compiler'
|
||||||
|
import { semverGt } from '../util'
|
||||||
|
|
||||||
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 next()
|
return next()
|
||||||
}
|
}
|
||||||
|
|
||||||
const nodeccMarker = 'argv[index][0] =='
|
if (semverGt(compiler.target.version, '11.6.0')) {
|
||||||
|
await compiler.replaceInFileAsync(
|
||||||
|
'src/node.cc',
|
||||||
|
/(?<!int )ProcessGlobalArgs\(argv[^;]*;/gm,
|
||||||
|
'0;/*$&*/'
|
||||||
|
)
|
||||||
|
} else if (semverGt(compiler.target.version, '10.9')) {
|
||||||
|
await compiler.replaceInFileAsync('src/node.cc', /(?<!void )ProcessArgv\(argv/g, '//$&')
|
||||||
|
} 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] =='
|
||||||
|
|
||||||
await compiler.replaceInFileAsync(
|
await compiler.replaceInFileAsync(
|
||||||
'src/node.cc',
|
'src/node.cc',
|
||||||
`${nodeccMarker} '-'`,
|
`${nodeccMarker} '-'`,
|
||||||
// allow NODE_OPTIONS, introduced in 8.0
|
// allow NODE_OPTIONS, introduced in 8.0
|
||||||
parseInt(compiler.target.version.split('.')[0]) >= 8
|
semverGt(compiler.target.version, '7.99')
|
||||||
? `(${nodeccMarker} (is_env ? '-' : ']'))`
|
? `(${nodeccMarker} (is_env ? '-' : ']'))`
|
||||||
: `(${nodeccMarker} ']')`
|
: `(${nodeccMarker} ']')`
|
||||||
)
|
)
|
||||||
|
}
|
||||||
|
|
||||||
return next()
|
return next()
|
||||||
}
|
}
|
||||||
|
|||||||
+2
-2
@@ -13,8 +13,8 @@ export default async function nodeGyp(
|
|||||||
`
|
`
|
||||||
${nodeGypMarker}
|
${nodeGypMarker}
|
||||||
${files
|
${files
|
||||||
.filter(x => x.filename.startsWith('lib'))
|
.filter((x) => x.filename.startsWith('lib'))
|
||||||
.map(x => `'${x.filename}'`)
|
.map((x) => `'${x.filename}'`)
|
||||||
.toString()},
|
.toString()},
|
||||||
`.trim()
|
`.trim()
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -5,8 +5,8 @@ import cli from './disable-node-cli'
|
|||||||
import flags from './flags'
|
import flags from './flags'
|
||||||
import ico from './ico'
|
import ico from './ico'
|
||||||
import rc from './node-rc'
|
import rc from './node-rc'
|
||||||
import { NexeCompiler, NexeOptions } from '../compiler'
|
import snapshot from './snapshot'
|
||||||
|
|
||||||
const patches = [gyp, bootNexe, buildFixes, cli, flags, ico, rc]
|
const patches = [gyp, bootNexe, buildFixes, cli, flags, ico, rc, snapshot]
|
||||||
|
|
||||||
export default patches
|
export default patches
|
||||||
|
|||||||
@@ -8,18 +8,19 @@ export default async function nodeRc(compiler: NexeCompiler, next: () => Promise
|
|||||||
|
|
||||||
const file = await compiler.readFileAsync('src/res/node.rc')
|
const file = await compiler.readFileAsync('src/res/node.rc')
|
||||||
|
|
||||||
Object.keys(options).forEach(key => {
|
Object.keys(options).forEach((key) => {
|
||||||
let value = options[key]
|
let value = options[key]
|
||||||
const isVar = /^[A-Z_]+$/.test(value)
|
const isVar = /^[A-Z_]+$/.test(value)
|
||||||
value = isVar ? value : `"${value}"`
|
value = isVar ? value : `"${value}"`
|
||||||
file.contents = file.contents.replace(
|
file.contents = file.contents
|
||||||
new RegExp(`VALUE "${key}",.*`),
|
.toString()
|
||||||
`VALUE "${key}", ${value}`
|
.replace(new RegExp(`VALUE "${key}",.*`), `VALUE "${key}", ${value}`)
|
||||||
)
|
|
||||||
})
|
})
|
||||||
;['PRODUCTVERSION', 'FILEVERSION'].forEach(x => {
|
;['PRODUCTVERSION', 'FILEVERSION'].forEach((x) => {
|
||||||
if (options[x]) {
|
if (options[x]) {
|
||||||
file.contents = file.contents.replace(new RegExp(x + ' .*$', 'm'), `${x} ${options[x]}`)
|
file.contents = file.contents
|
||||||
|
.toString()
|
||||||
|
.replace(new RegExp(x + ' .*$', 'm'), `${x} ${options[x]}`)
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|||||||
+15
-7
@@ -1,18 +1,26 @@
|
|||||||
|
import { resolve } from 'path'
|
||||||
import { NexeCompiler } from '../compiler'
|
import { NexeCompiler } from '../compiler'
|
||||||
|
import { semverGt } from '../util'
|
||||||
|
|
||||||
export default async function snapshot(compiler: NexeCompiler, next: () => Promise<void>) {
|
export default async function (compiler: NexeCompiler, next: () => Promise<void>) {
|
||||||
const snapshotFile = compiler.options.snapshot
|
const { snapshot, warmup, cwd } = compiler.options
|
||||||
const warmupScript = compiler.options.warmup
|
|
||||||
|
|
||||||
if (!snapshotFile) {
|
if (!snapshot) {
|
||||||
return next()
|
return next()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const variablePrefix = semverGt(compiler.target.version, '11.0.0') ? 'v8_' : ''
|
||||||
|
|
||||||
await compiler.replaceInFileAsync(
|
await compiler.replaceInFileAsync(
|
||||||
'configure',
|
compiler.configureScript,
|
||||||
'def configure_v8(o):',
|
'def configure_v8(o):',
|
||||||
`def configure_v8(o):\n o['variables']['embed_script'] = '${snapshotFile}'\n o['variables']['warmup_script'] = '${warmupScript ||
|
`def configure_v8(o):\n o['variables']['${variablePrefix}embed_script'] = r'${resolve(
|
||||||
snapshotFile}'`
|
cwd,
|
||||||
|
snapshot
|
||||||
|
)}'\n o['variables']['${variablePrefix}warmup_script'] = r'${resolve(
|
||||||
|
cwd,
|
||||||
|
warmup || snapshot
|
||||||
|
)}'`
|
||||||
)
|
)
|
||||||
|
|
||||||
return next()
|
return next()
|
||||||
|
|||||||
@@ -1,11 +1,118 @@
|
|||||||
import { NexeCompiler } from '../compiler'
|
import { NexeCompiler } from '../compiler'
|
||||||
import { readFileSync } from 'fs'
|
import { parse } from 'meriyah'
|
||||||
import { join } from 'path'
|
import { wrap, semverGt } from '../util'
|
||||||
|
|
||||||
|
function walkSome(node: any, visit: Function) {
|
||||||
|
if (!node || typeof node.type !== 'string' || node._visited) {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
visit(node)
|
||||||
|
node._visited = true
|
||||||
|
for (let childNode in node) {
|
||||||
|
const child = node[childNode]
|
||||||
|
if (Array.isArray(child)) {
|
||||||
|
for (let i = 0; i < child.length; i++) {
|
||||||
|
if (walkSome(child[i], visit)) {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else if (walkSome(child, visit)) {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
export default async function main(compiler: NexeCompiler, next: () => Promise<void>) {
|
export default async function main(compiler: NexeCompiler, next: () => Promise<void>) {
|
||||||
await compiler.setFileContentsAsync(
|
let bootFile = 'lib/internal/bootstrap_node.js'
|
||||||
'lib/_third_party_main.js',
|
const { version } = compiler.target
|
||||||
'{{replace:lib/patches/boot-nexe.js}}'
|
|
||||||
)
|
if (version.startsWith('4.')) {
|
||||||
|
bootFile = 'src/node.js'
|
||||||
|
} else if (semverGt(version, '18.11.99')) {
|
||||||
|
bootFile = 'lib/internal/process/pre_execution.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.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')
|
||||||
|
if (semverGt(version, '19.99')) {
|
||||||
|
await compiler.replaceInFileAsync(
|
||||||
|
'lib/internal/modules/cjs/loader.js',
|
||||||
|
"'use strict';",
|
||||||
|
"'use strict';\n" + '{{ file("lib/fs/bootstrap.js") }}' + '\n'
|
||||||
|
)
|
||||||
|
fileLines.splice(location.start.line, 0, 'expandArgv1 = false;')
|
||||||
|
} else {
|
||||||
|
fileLines.splice(
|
||||||
|
location.start.line,
|
||||||
|
0,
|
||||||
|
'{{ file("lib/fs/bootstrap.js") }}' +
|
||||||
|
'\n' +
|
||||||
|
(semverGt(version, '11.99') ? 'expandArgv1 = false;\n' : '')
|
||||||
|
)
|
||||||
|
}
|
||||||
|
file.contents = fileLines.join('\n')
|
||||||
|
|
||||||
|
if (semverGt(version, '11.99')) {
|
||||||
|
if (semverGt(version, '12.17.99')) {
|
||||||
|
await compiler.replaceInFileAsync(
|
||||||
|
bootFile,
|
||||||
|
'initializeFrozenIntrinsics();',
|
||||||
|
'initializeFrozenIntrinsics();\n' + wrap('{{ file("lib/patches/boot-nexe.js") }}')
|
||||||
|
)
|
||||||
|
} else {
|
||||||
|
await compiler.replaceInFileAsync(
|
||||||
|
bootFile,
|
||||||
|
'initializePolicy();',
|
||||||
|
'initializePolicy();\n' + wrap('{{ file("lib/patches/boot-nexe.js") }}')
|
||||||
|
)
|
||||||
|
}
|
||||||
|
await compiler.replaceInFileAsync(
|
||||||
|
bootFile,
|
||||||
|
'assert(!CJSLoader.hasLoadedAnyUserCJSModule)',
|
||||||
|
'/*assert(!CJSLoader.hasLoadedAnyUserCJSModule)*/'
|
||||||
|
)
|
||||||
|
const { contents: nodeccContents } = await compiler.readFileAsync('src/node.cc')
|
||||||
|
if (nodeccContents.includes('if (env->worker_context() != nullptr) {')) {
|
||||||
|
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'
|
||||||
|
)
|
||||||
|
} else {
|
||||||
|
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',
|
||||||
|
'{{ file("lib/patches/boot-nexe.js") }}'
|
||||||
|
)
|
||||||
|
}
|
||||||
return next()
|
return next()
|
||||||
}
|
}
|
||||||
|
|||||||
+11
-16
@@ -1,16 +1,8 @@
|
|||||||
import got = require('got')
|
import got = require('got')
|
||||||
import download = require('download')
|
import { platforms, architectures, NexeTarget, getTarget, targetsEqual } from './target'
|
||||||
import {
|
|
||||||
NodePlatform,
|
|
||||||
NodeArch,
|
|
||||||
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]
|
||||||
export interface GitAsset {
|
export interface GitAsset {
|
||||||
name: string
|
name: string
|
||||||
url: string
|
url: string
|
||||||
@@ -33,8 +25,10 @@ async function getJson<T>(url: string, options?: any) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function isBuildableVersion(version: string) {
|
function isBuildableVersion(version: string) {
|
||||||
const major = +version.split('.')[0]
|
if (version === '12.11.0') {
|
||||||
return !~[0, 1, 2, 3, 4, 5, 7].indexOf(major) || version === '4.8.4'
|
return false
|
||||||
|
}
|
||||||
|
return !versionsToSkip.includes(Number(version.split('.')[0]))
|
||||||
}
|
}
|
||||||
|
|
||||||
export function getLatestGitRelease(options?: any) {
|
export function getLatestGitRelease(options?: any) {
|
||||||
@@ -45,7 +39,7 @@ 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'
|
||||||
)
|
)
|
||||||
const existingVersions = (await getLatestGitRelease(options)).assets.map(x => getTarget(x.name))
|
const existingVersions = (await getLatestGitRelease(options)).assets.map((x) => getTarget(x.name))
|
||||||
|
|
||||||
const versionMap: { [key: string]: true } = {}
|
const versionMap: { [key: string]: true } = {}
|
||||||
return nodeReleases
|
return nodeReleases
|
||||||
@@ -55,13 +49,14 @@ 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
|
||||||
versions.push(getTarget({ platform, arch, version }))
|
versions.push(getTarget({ platform, arch, version }))
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
return versions
|
return versions
|
||||||
}, [])
|
}, [])
|
||||||
.filter(x => !existingVersions.some(t => targetsEqual(t, x)))
|
.filter((x) => !existingVersions.some((t) => targetsEqual(t, x)))
|
||||||
}
|
}
|
||||||
|
|||||||
+12
-14
@@ -1,29 +1,28 @@
|
|||||||
import { join, dirname } from 'path'
|
import { join, dirname } from 'path'
|
||||||
import { readdir, unlink } from 'fs'
|
import * as fs from 'fs'
|
||||||
|
import { promisify } from 'util'
|
||||||
import { readFileAsync, writeFileAsync, isDirectoryAsync } from '../util'
|
import { readFileAsync, writeFileAsync, isDirectoryAsync } from '../util'
|
||||||
import * as mkdirp from 'mkdirp'
|
import mkdirpAsync = require('mkdirp')
|
||||||
import { NexeCompiler } from '../compiler'
|
import { NexeCompiler } from '../compiler'
|
||||||
import pify = require('pify')
|
|
||||||
|
|
||||||
const mkdirpAsync = pify(mkdirp)
|
const unlinkAsync = promisify(fs.unlink),
|
||||||
const unlinkAsync = pify(unlink)
|
readdirAsync = promisify(fs.readdir)
|
||||||
const readdirAsync = pify(readdir)
|
|
||||||
|
|
||||||
function readDirAsync(dir: string): Promise<string[]> {
|
function readDirAsync(dir: string): Promise<string[]> {
|
||||||
return readdirAsync(dir).then(paths => {
|
return readdirAsync(dir).then((paths) => {
|
||||||
return Promise.all(
|
return Promise.all(
|
||||||
paths.map((file: string) => {
|
paths.map((file: string) => {
|
||||||
const path = join(dir, file)
|
const path = join(dir, file)
|
||||||
return isDirectoryAsync(path).then(x => (x ? readDirAsync(path) : (path as any)))
|
return isDirectoryAsync(path).then((x) => (x ? readDirAsync(path) : (path as any)))
|
||||||
})
|
})
|
||||||
).then(result => {
|
).then((result) => {
|
||||||
return [].concat(...(result as any))
|
return [].concat(...(result as any))
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
function maybeReadFileContentsAsync(file: string) {
|
function maybeReadFileContentsAsync(file: string) {
|
||||||
return readFileAsync(file, 'utf-8').catch(e => {
|
return readFileAsync(file, 'utf-8').catch((e) => {
|
||||||
if (e.code === 'ENOENT') {
|
if (e.code === 'ENOENT') {
|
||||||
return ''
|
return ''
|
||||||
}
|
}
|
||||||
@@ -39,7 +38,6 @@ function maybeReadFileContentsAsync(file: string) {
|
|||||||
* - After the patch functions have run, the temporary directory is emptied
|
* - After the patch functions have run, the temporary directory is emptied
|
||||||
* - Original versions of sources to be patched are written to the temporary directory
|
* - Original versions of sources to be patched are written to the temporary directory
|
||||||
* - 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
|
||||||
@@ -48,16 +46,16 @@ export default async function artifacts(compiler: NexeCompiler, next: () => Prom
|
|||||||
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 compiler.writeFileAsync(path.replace(temp, ''), await readFileAsync(path, 'utf-8'))
|
return compiler.writeFileAsync(path.replace(temp, ''), await readFileAsync(path, 'utf-8'))
|
||||||
})
|
})
|
||||||
)
|
)
|
||||||
|
|
||||||
await next()
|
await next()
|
||||||
|
|
||||||
await Promise.all(tmpFiles.map(x => unlinkAsync(x)))
|
await Promise.all(tmpFiles.map((x) => unlinkAsync(x)))
|
||||||
return 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)
|
||||||
const tempFile = join(temp, file.filename)
|
const tempFile = join(temp, file.filename)
|
||||||
const fileContents = await maybeReadFileContentsAsync(sourceFile)
|
const fileContents = await maybeReadFileContentsAsync(sourceFile)
|
||||||
|
|||||||
+68
-43
@@ -1,63 +1,88 @@
|
|||||||
import { NexeCompiler } from '../compiler'
|
import { NexeCompiler, NexeError } from '../compiler'
|
||||||
import { readFileAsync, writeFileAsync } from '../util'
|
|
||||||
import { resolve, relative } from 'path'
|
import { resolve, relative } from 'path'
|
||||||
import NativeModulePlugin from '../bundling/fuse-native-module-plugin'
|
import resolveFiles, { resolveSync } from 'resolve-dependencies'
|
||||||
import { NexeOptions } from '../options'
|
import { dequote, STDIN_FLAG, semverGt, each } from '../util'
|
||||||
|
import { Readable } from 'stream'
|
||||||
|
|
||||||
function createBundle(options: NexeOptions) {
|
function getStdIn(stdin: Readable): Promise<string> {
|
||||||
const { FuseBox, JSONPlugin, CSSPlugin, HTMLPlugin, QuantumPlugin } = require('fuse-box')
|
let out = ''
|
||||||
const plugins: any = [JSONPlugin(), CSSPlugin(), HTMLPlugin(), NativeModulePlugin(options.native)]
|
return new Promise((resolve) => {
|
||||||
if (options.compress) {
|
stdin
|
||||||
plugins.push(
|
.setEncoding('utf8')
|
||||||
QuantumPlugin({
|
.on('readable', () => {
|
||||||
target: 'server@esnext',
|
let current
|
||||||
uglify: true,
|
while ((current = stdin.read())) {
|
||||||
bakeApiIntoBundle: options.name
|
out += current
|
||||||
|
}
|
||||||
})
|
})
|
||||||
)
|
.on('end', () => resolve(out.trim()))
|
||||||
}
|
setTimeout(() => {
|
||||||
const cwd = options.cwd
|
if (!out.trim()) {
|
||||||
const fuse = FuseBox.init({
|
resolve(out.trim())
|
||||||
cache: false,
|
}
|
||||||
log: Boolean(process.env.NEXE_BUNDLE_LOG) || false,
|
}, 1000)
|
||||||
homeDir: cwd,
|
|
||||||
sourceMaps: false,
|
|
||||||
writeBundles: false,
|
|
||||||
output: '$name.js',
|
|
||||||
target: 'server@esnext', //try not to transpile
|
|
||||||
plugins
|
|
||||||
})
|
|
||||||
const input = relative(cwd, resolve(cwd, options.input)).replace(/\\/g, '/')
|
|
||||||
fuse.bundle(options.name).instructions(`> ${input}`)
|
|
||||||
return fuse.run().then((x: any) => {
|
|
||||||
let output = ''
|
|
||||||
x.bundles.forEach((y: any) => (output = y.context.output.lastPrimaryOutput.content.toString()))
|
|
||||||
return output
|
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
export default async function bundle(compiler: NexeCompiler, next: any) {
|
export default async function bundle(compiler: NexeCompiler, next: any) {
|
||||||
const { bundle, cwd, empty, input } = compiler.options
|
const { bundle: doBundle, cwd, input: inputPath } = compiler.options
|
||||||
if (!bundle) {
|
let input = inputPath
|
||||||
compiler.input = await readFileAsync(resolve(cwd, input), 'utf-8')
|
compiler.entrypoint = './' + relative(cwd, input)
|
||||||
|
|
||||||
|
if (semverGt(compiler.target.version, '11.99')) {
|
||||||
|
compiler.startup = ''
|
||||||
|
} else {
|
||||||
|
compiler.startup = ';require("module").runMain();'
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!doBundle) {
|
||||||
|
await compiler.addResource(resolve(cwd, input))
|
||||||
return next()
|
return next()
|
||||||
}
|
}
|
||||||
|
|
||||||
if (compiler.options.empty || !compiler.options.input) {
|
let code = ''
|
||||||
compiler.input = ''
|
if (typeof doBundle === 'string') {
|
||||||
|
code = await require(doBundle).createBundle(compiler.options)
|
||||||
|
}
|
||||||
|
|
||||||
|
if (input === STDIN_FLAG && (code = code || dequote(await getStdIn(process.stdin)))) {
|
||||||
|
compiler.stdinUsed = true
|
||||||
|
compiler.entrypoint = './__nexe_stdin.js'
|
||||||
|
await compiler.addResource(resolve(cwd, compiler.entrypoint), code)
|
||||||
return next()
|
return next()
|
||||||
}
|
}
|
||||||
|
|
||||||
let producer = createBundle
|
if (input === STDIN_FLAG) {
|
||||||
if (typeof bundle === 'string') {
|
const maybeInput = resolveSync(cwd, '.')
|
||||||
producer = require(resolve(cwd, bundle)).createBundle
|
if (!maybeInput || !maybeInput.absPath) {
|
||||||
|
throw new NexeError('No valid input detected')
|
||||||
|
}
|
||||||
|
input = maybeInput.absPath
|
||||||
|
compiler.entrypoint = './' + relative(cwd, input)
|
||||||
}
|
}
|
||||||
|
|
||||||
compiler.input = await producer(compiler.options)
|
const step = compiler.log.step('Resolving dependencies...')
|
||||||
|
|
||||||
if ('string' === typeof compiler.options.debugBundle) {
|
const { files, warnings } = await resolveFiles(
|
||||||
await writeFileAsync(resolve(cwd, compiler.options.debugBundle), compiler.input)
|
input,
|
||||||
|
...Object.keys(compiler.bundle.list).filter((x) => x.endsWith('.js') || x.endsWith('.mjs')),
|
||||||
|
{ cwd, expand: 'variable', loadContent: false }
|
||||||
|
)
|
||||||
|
|
||||||
|
if (
|
||||||
|
warnings.filter((x) => x.startsWith('Error parsing file') && !x.includes('node_modules')).length
|
||||||
|
) {
|
||||||
|
throw new NexeError('Parsing Error:\n' + warnings.join('\n'))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//TODO: warnings.forEach((x) => console.log(x))
|
||||||
|
|
||||||
|
await Promise.all(
|
||||||
|
Object.entries(files).map(([key]) => {
|
||||||
|
step.log(`Including dependency: ${key}`)
|
||||||
|
return compiler.addResource(key)
|
||||||
|
})
|
||||||
|
)
|
||||||
|
|
||||||
return next()
|
return next()
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,19 @@
|
|||||||
|
import { NexeCompiler } from '../compiler'
|
||||||
|
import { rimrafAsync } from '../util'
|
||||||
|
import { NexeTarget } from '../target'
|
||||||
|
|
||||||
|
export default async function clean(compiler: NexeCompiler, next: () => Promise<any>) {
|
||||||
|
const { options } = compiler
|
||||||
|
if (options.clean) {
|
||||||
|
let path = compiler.src
|
||||||
|
if (!options.build) {
|
||||||
|
path = compiler.getNodeExecutableLocation(compiler.options.targets[0] as NexeTarget)
|
||||||
|
}
|
||||||
|
const step = compiler.log.step('Cleaning up nexe build artifacts...')
|
||||||
|
step.log(`Deleting contents at: ${path}`)
|
||||||
|
await rimrafAsync(path)
|
||||||
|
step.log(`Deleted contents at: ${path}`)
|
||||||
|
return compiler.quit()
|
||||||
|
}
|
||||||
|
return next()
|
||||||
|
}
|
||||||
+28
-42
@@ -1,24 +1,9 @@
|
|||||||
import { normalize, relative } from 'path'
|
import { dirname, normalize, relative, resolve } from 'path'
|
||||||
import { Readable } from 'stream'
|
|
||||||
import { createWriteStream, chmodSync, statSync } from 'fs'
|
import { createWriteStream, chmodSync, statSync } from 'fs'
|
||||||
import { readFileAsync, dequote, isWindows } from '../util'
|
|
||||||
import { NexeCompiler } from '../compiler'
|
import { NexeCompiler } from '../compiler'
|
||||||
import { NexeTarget } from '../target'
|
import { NexeTarget } from '../target'
|
||||||
|
import { STDIN_FLAG } from '../util'
|
||||||
function getStdIn(stdin: NodeJS.ReadStream): Promise<string> {
|
import mkdirp = require('mkdirp')
|
||||||
return new Promise(resolve => {
|
|
||||||
let out = ''
|
|
||||||
stdin
|
|
||||||
.setEncoding('utf8')
|
|
||||||
.on('readable', () => {
|
|
||||||
let current
|
|
||||||
while ((current = stdin.read())) {
|
|
||||||
out += current
|
|
||||||
}
|
|
||||||
})
|
|
||||||
.on('end', () => resolve(out))
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 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,
|
||||||
@@ -26,47 +11,48 @@ function getStdIn(stdin: NodeJS.ReadStream): Promise<string> {
|
|||||||
* After all the build steps have run, the output (the executable) is written to a file or piped to stdout.
|
* After all the build steps have run, the output (the executable) is written to a file or piped to stdout.
|
||||||
*
|
*
|
||||||
* Configuration:
|
* Configuration:
|
||||||
* - compiler.options.input - file path to the input bundle.
|
|
||||||
* - fallbacks: stdin, package.json#main
|
|
||||||
* - compiler.options.output - file path to the output executable.
|
|
||||||
* - fallbacks: stdout, nexe_ + epoch + ext
|
|
||||||
*
|
*
|
||||||
* @param {*} compiler
|
* @param {*} compiler
|
||||||
* @param {*} next
|
* @param {*} next
|
||||||
*/
|
*/
|
||||||
export default async function cli(compiler: NexeCompiler, next: () => Promise<void>) {
|
export default async function cli(compiler: NexeCompiler, next: () => Promise<void>) {
|
||||||
const { log } = compiler
|
|
||||||
let stdInUsed = false
|
|
||||||
if (!process.stdin.isTTY && compiler.options.enableStdIn) {
|
|
||||||
stdInUsed = true
|
|
||||||
compiler.input = dequote(await getStdIn(process.stdin))
|
|
||||||
}
|
|
||||||
|
|
||||||
await next()
|
await next()
|
||||||
|
const { log } = compiler,
|
||||||
|
target = compiler.options.targets.shift() as NexeTarget,
|
||||||
|
deliverable = await compiler.compileAsync(target),
|
||||||
|
output = normalize(compiler.output!)
|
||||||
|
|
||||||
const target = compiler.options.targets.shift() as NexeTarget
|
mkdirp.sync(dirname(output))
|
||||||
const deliverable = await compiler.compileAsync(target)
|
|
||||||
|
|
||||||
return new Promise((resolve, reject) => {
|
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(normalize(compiler.output!)))
|
.pipe(createWriteStream(output))
|
||||||
.on('error', reject)
|
.on('error', rej)
|
||||||
.once('close', (e: Error) => {
|
.once('close', (e: Error) => {
|
||||||
if (e) {
|
if (e) {
|
||||||
reject(e)
|
rej(e)
|
||||||
} else if (compiler.output) {
|
} else if (compiler.output) {
|
||||||
const output = compiler.output
|
const output = compiler.output,
|
||||||
const mode = statSync(output).mode | 0o111
|
mode = statSync(output).mode | 0o111,
|
||||||
|
inputFileLogOutput = relative(
|
||||||
|
process.cwd(),
|
||||||
|
resolve(compiler.options.cwd, compiler.entrypoint || compiler.options.input)
|
||||||
|
),
|
||||||
|
outputFileLogOutput = relative(process.cwd(), output)
|
||||||
|
|
||||||
chmodSync(output, mode.toString(8).slice(-3))
|
chmodSync(output, mode.toString(8).slice(-3))
|
||||||
const inputFile = relative(process.cwd(), compiler.options.input)
|
|
||||||
const outputFile = relative(process.cwd(), output)
|
|
||||||
step.log(
|
step.log(
|
||||||
`Entry: '${
|
`Entry: '${
|
||||||
stdInUsed ? (compiler.options.empty ? '[empty]' : '[stdin]') : inputFile
|
compiler.stdinUsed
|
||||||
}' written to: ${outputFile}`
|
? compiler.options.mangle
|
||||||
|
? STDIN_FLAG
|
||||||
|
: '[none]'
|
||||||
|
: inputFileLogOutput
|
||||||
|
}' written to: ${outputFileLogOutput}`
|
||||||
)
|
)
|
||||||
resolve(compiler.quit())
|
compiler.quit()
|
||||||
|
res(output)
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|||||||
+44
-11
@@ -2,8 +2,8 @@ import download = require('download')
|
|||||||
import { pathExistsAsync } from '../util'
|
import { pathExistsAsync } from '../util'
|
||||||
import { LogStep } from '../logger'
|
import { LogStep } from '../logger'
|
||||||
import { IncomingMessage } from 'http'
|
import { IncomingMessage } from 'http'
|
||||||
import { NexeCompiler } from '../compiler'
|
import { NexeCompiler, NexeError } from '../compiler'
|
||||||
import { NexeTarget } from '../target'
|
import { dirname } from 'path'
|
||||||
|
|
||||||
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()}%...`)
|
||||||
@@ -11,9 +11,9 @@ function fetchNodeSourceAsync(dest: string, url: string, step: LogStep, options
|
|||||||
.on('response', (res: IncomingMessage) => {
|
.on('response', (res: IncomingMessage) => {
|
||||||
const total = +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) {
|
||||||
step.log('Extracting Node...')
|
step.log('Extracting Node...')
|
||||||
}
|
}
|
||||||
@@ -22,23 +22,56 @@ function fetchNodeSourceAsync(dest: string, url: string, step: LogStep, options
|
|||||||
.then(() => step.log(`Node source extracted to: ${dest}`))
|
.then(() => step.log(`Node source extracted to: ${dest}`))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async function fetchPrebuiltBinary(compiler: NexeCompiler, step: any) {
|
||||||
|
const { target, remoteAsset } = compiler,
|
||||||
|
filename = compiler.getNodeExecutableLocation(target)
|
||||||
|
|
||||||
|
try {
|
||||||
|
await download(remoteAsset, dirname(filename), compiler.options.downloadOptions).on(
|
||||||
|
'response',
|
||||||
|
(res: IncomingMessage) => {
|
||||||
|
const total = +res.headers['content-length']!
|
||||||
|
let current = 0
|
||||||
|
res.on('data', (data) => {
|
||||||
|
current += data.length
|
||||||
|
step!.modify(`Downloading...${((current / total) * 100).toFixed()}%`)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
)
|
||||||
|
} catch (e: any) {
|
||||||
|
if (e.statusCode === 404) {
|
||||||
|
throw new NexeError(`${remoteAsset} is not available, create it using the --build flag`)
|
||||||
|
} else {
|
||||||
|
throw new NexeError('Error downloading prebuilt binary: ' + e)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Downloads the node source to the configured temporary directory
|
* Downloads the node source to the configured temporary directory
|
||||||
* @param {*} compiler
|
* @param {*} compiler
|
||||||
* @param {*} next
|
* @param {*} next
|
||||||
*/
|
*/
|
||||||
export default async function downloadNode(compiler: NexeCompiler, next: () => Promise<void>) {
|
export default async function downloadNode(compiler: NexeCompiler, next: () => Promise<void>) {
|
||||||
const { src, log, targets: [{ version }] } = compiler
|
const { src, log, target } = compiler,
|
||||||
const { sourceUrl, downloadOptions } = compiler.options
|
{ version } = target,
|
||||||
const url = sourceUrl || `https://nodejs.org/dist/v${version}/node-v${version}.tar.gz`
|
{ sourceUrl, downloadOptions, build } = compiler.options,
|
||||||
const step = log.step(`Downloading Node.js source from: ${url}`)
|
url = sourceUrl || `https://nodejs.org/dist/v${version}/node-v${version}.tar.gz`,
|
||||||
if (await pathExistsAsync(src)) {
|
step = log.step(
|
||||||
step.log('Source already downloaded')
|
`Downloading ${build ? '' : 'pre-built '}Node.js${build ? ` source from: ${url}` : ''}`
|
||||||
|
),
|
||||||
|
exeLocation = compiler.getNodeExecutableLocation(build ? undefined : target),
|
||||||
|
downloadExists = await pathExistsAsync(build ? src : exeLocation)
|
||||||
|
|
||||||
|
if (downloadExists) {
|
||||||
|
step.log('Already downloaded...')
|
||||||
return next()
|
return next()
|
||||||
}
|
}
|
||||||
|
|
||||||
if (compiler.options.build) {
|
if (build) {
|
||||||
await fetchNodeSourceAsync(src, url, step, downloadOptions)
|
await fetchNodeSourceAsync(src, url, step, downloadOptions)
|
||||||
|
} else {
|
||||||
|
await fetchPrebuiltBinary(compiler, step)
|
||||||
}
|
}
|
||||||
|
|
||||||
return next()
|
return next()
|
||||||
|
|||||||
+14
-14
@@ -1,25 +1,25 @@
|
|||||||
import { readFileAsync, isDirectoryAsync, each } from '../util'
|
import { each } from '../util'
|
||||||
import { Buffer } from 'buffer'
|
import globs from 'globby'
|
||||||
import * as globs from 'globby'
|
import { resolve } from 'path'
|
||||||
import { NexeCompiler } from '../compiler'
|
import { NexeCompiler } from '../compiler'
|
||||||
|
|
||||||
export default async function resource(compiler: NexeCompiler, next: () => Promise<void>) {
|
export default async function resource(compiler: NexeCompiler, next: () => Promise<any>) {
|
||||||
const resources = compiler.resources
|
const { cwd, resources } = compiler.options
|
||||||
|
if (!resources.length) {
|
||||||
if (!compiler.options.resources.length) {
|
|
||||||
return next()
|
return next()
|
||||||
}
|
}
|
||||||
const step = compiler.log.step('Bundling Resources...')
|
const step = compiler.log.step('Bundling Resources...')
|
||||||
let count = 0
|
let count = 0
|
||||||
await each(globs(compiler.options.resources), async file => {
|
|
||||||
if (await isDirectoryAsync(file)) {
|
// workaround for https://github.com/sindresorhus/globby/issues/127
|
||||||
return
|
// and https://github.com/mrmlnc/fast-glob#pattern-syntax
|
||||||
}
|
const resourcesWithForwardSlashes = resources.map((r) => r.replace(/\\/g, '/'))
|
||||||
|
|
||||||
|
await each(globs(resourcesWithForwardSlashes, { cwd, onlyFiles: true }), async (file) => {
|
||||||
count++
|
count++
|
||||||
step.log(`Including file: ${file}`)
|
step.log(`Including file: ${file}`)
|
||||||
const contents = await readFileAsync(file)
|
await compiler.addResource(resolve(cwd, file))
|
||||||
compiler.addResource(file, contents)
|
|
||||||
})
|
})
|
||||||
step.log(`Included ${count} file(s). ${(resources.bundle.byteLength / 1e6).toFixed(3)} MB`)
|
step.log(`Included ${count} file(s)`)
|
||||||
return next()
|
return next()
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,207 +0,0 @@
|
|||||||
import { Stats } from 'fs'
|
|
||||||
import { ok } from 'assert'
|
|
||||||
import { dirname, resolve, normalize, basename } from 'path'
|
|
||||||
|
|
||||||
const binary = (process as any).__nexe as NexeBinary
|
|
||||||
ok(binary)
|
|
||||||
const manifest = binary.resources
|
|
||||||
const directories: { [key: string]: { [key: string]: boolean } } = {}
|
|
||||||
const isString = (x: any): x is string => typeof x === 'string' || x instanceof String
|
|
||||||
const isNotFile = () => false
|
|
||||||
const isNotDirectory = isNotFile
|
|
||||||
const isFile = () => true
|
|
||||||
const isDirectory = isFile
|
|
||||||
|
|
||||||
if (Object.keys(manifest).length) {
|
|
||||||
const fs = require('fs')
|
|
||||||
const originalReadFile = fs.readFile
|
|
||||||
const originalReadFileSync = fs.readFileSync
|
|
||||||
const originalCreateReadStream = fs.createReadStream
|
|
||||||
const originalReaddir = fs.readdir
|
|
||||||
const originalReaddirSync = fs.readdirSync
|
|
||||||
const originalStatSync = fs.statSync
|
|
||||||
const originalStat = fs.stat
|
|
||||||
const resourceStart = binary.layout.resourceStart
|
|
||||||
|
|
||||||
const statTime = function() {
|
|
||||||
const stat = binary.layout.stat
|
|
||||||
return {
|
|
||||||
dev: 0,
|
|
||||||
ino: 0,
|
|
||||||
nlink: 0,
|
|
||||||
rdev: 0,
|
|
||||||
uid: 123,
|
|
||||||
gid: 500,
|
|
||||||
blksize: 4096,
|
|
||||||
blocks: 0,
|
|
||||||
atime: new Date(stat.atime),
|
|
||||||
atimeMs: stat.atime.getTime(),
|
|
||||||
mtime: new Date(stat.mtime),
|
|
||||||
mtimeMs: stat.mtime.getTime(),
|
|
||||||
ctime: new Date(stat.ctime),
|
|
||||||
ctimMs: stat.ctime.getTime(),
|
|
||||||
birthtime: new Date(stat.birthtime),
|
|
||||||
birthtimeMs: stat.birthtime.getTime()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
const createStat = function(directoryExtensions: any, fileExtensions?: any) {
|
|
||||||
if (!fileExtensions) {
|
|
||||||
return Object.assign({}, binary.layout.stat, directoryExtensions, { size: 0 }, statTime())
|
|
||||||
}
|
|
||||||
const size = directoryExtensions[1]
|
|
||||||
return Object.assign({}, binary.layout.stat, fileExtensions, { size }, statTime())
|
|
||||||
}
|
|
||||||
|
|
||||||
const ownStat = function(path: string | Buffer) {
|
|
||||||
const key = resolve(path as string)
|
|
||||||
if (directories[key]) {
|
|
||||||
return createStat({ isDirectory, isFile: isNotFile })
|
|
||||||
}
|
|
||||||
if (manifest[key]) {
|
|
||||||
return createStat(manifest[key], { isFile, isDirectory: isNotDirectory })
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
let setupManifest = () => {
|
|
||||||
Object.keys(manifest).forEach(key => {
|
|
||||||
const absolutePath = resolve(key)
|
|
||||||
const dirPath = dirname(absolutePath)
|
|
||||||
directories[dirPath] = directories[dirPath] || {}
|
|
||||||
directories[dirPath][basename(absolutePath)] = true
|
|
||||||
if (!manifest[absolutePath]) {
|
|
||||||
manifest[absolutePath] = manifest[key]
|
|
||||||
}
|
|
||||||
const normalizedPath = normalize(key)
|
|
||||||
if (!manifest[normalizedPath]) {
|
|
||||||
manifest[normalizedPath] = manifest[key]
|
|
||||||
}
|
|
||||||
})
|
|
||||||
setupManifest = () => {}
|
|
||||||
}
|
|
||||||
//naive patches intended to work for most use cases
|
|
||||||
var nfs = {
|
|
||||||
readdir: function readdir(path: string | Buffer, options: any, callback: any) {
|
|
||||||
setupManifest()
|
|
||||||
path = path.toString()
|
|
||||||
if ('function' === typeof options) {
|
|
||||||
callback = options
|
|
||||||
options = { encoding: 'utf8' }
|
|
||||||
}
|
|
||||||
const dir = directories[resolve(path)]
|
|
||||||
if (dir) {
|
|
||||||
process.nextTick(() => {
|
|
||||||
callback(null, Object.keys(dir))
|
|
||||||
})
|
|
||||||
} else {
|
|
||||||
return originalReaddir.apply(fs, arguments)
|
|
||||||
}
|
|
||||||
},
|
|
||||||
|
|
||||||
readdirSync: function readdirSync(path: string | Buffer, options: any) {
|
|
||||||
setupManifest()
|
|
||||||
path = path.toString()
|
|
||||||
const dir = directories[resolve(path)]
|
|
||||||
if (dir) {
|
|
||||||
return Object.keys(dir)
|
|
||||||
}
|
|
||||||
return originalReaddirSync.apply(fs, arguments)
|
|
||||||
},
|
|
||||||
|
|
||||||
readFile: function readFile(file: any, options: any, callback: any) {
|
|
||||||
setupManifest()
|
|
||||||
const entry = manifest[file]
|
|
||||||
if (!entry || !isString(file)) {
|
|
||||||
return originalReadFile.apply(fs, arguments)
|
|
||||||
}
|
|
||||||
const [offset, length] = entry
|
|
||||||
const resourceOffset = resourceStart + offset
|
|
||||||
const encoding = isString(options) ? options : null
|
|
||||||
callback = typeof options === 'function' ? options : callback
|
|
||||||
|
|
||||||
fs.open(process.execPath, 'r', function(err: Error, fd: number) {
|
|
||||||
if (err) return callback(err, null)
|
|
||||||
fs.read(fd, Buffer.alloc(length), 0, length, resourceOffset, function(
|
|
||||||
error: Error,
|
|
||||||
bytesRead: number,
|
|
||||||
result: Buffer
|
|
||||||
) {
|
|
||||||
if (error) {
|
|
||||||
return fs.close(fd, function() {
|
|
||||||
callback(error, null)
|
|
||||||
})
|
|
||||||
}
|
|
||||||
fs.close(fd, function(err: Error) {
|
|
||||||
if (err) {
|
|
||||||
return callback(err, result)
|
|
||||||
}
|
|
||||||
callback(err, encoding ? result.toString(encoding) : result)
|
|
||||||
})
|
|
||||||
})
|
|
||||||
})
|
|
||||||
},
|
|
||||||
createReadStream: function createReadStream(file: any, options: any) {
|
|
||||||
setupManifest()
|
|
||||||
const entry = manifest[file]
|
|
||||||
if (!entry || !isString(file)) {
|
|
||||||
return originalCreateReadStream.apply(fs, arguments)
|
|
||||||
}
|
|
||||||
const [offset, length] = entry
|
|
||||||
const resourceOffset = resourceStart + offset
|
|
||||||
const opts = !options ? {} : isString(options) ? { encoding: options } : options
|
|
||||||
|
|
||||||
return fs.createReadStream(
|
|
||||||
process.execPath,
|
|
||||||
Object.assign({}, opts, {
|
|
||||||
start: resourceOffset,
|
|
||||||
end: resourceOffset + length
|
|
||||||
})
|
|
||||||
)
|
|
||||||
},
|
|
||||||
readFileSync: function readFileSync(file: any, options: any) {
|
|
||||||
setupManifest()
|
|
||||||
const entry = manifest[file]
|
|
||||||
if (!entry || !isString(file)) {
|
|
||||||
return originalReadFileSync.apply(fs, arguments)
|
|
||||||
}
|
|
||||||
const [offset, length] = entry
|
|
||||||
const resourceOffset = resourceStart + offset
|
|
||||||
const encoding = isString(options) ? options : null
|
|
||||||
const fd = fs.openSync(process.execPath, 'r')
|
|
||||||
const result = Buffer.alloc(length)
|
|
||||||
fs.readSync(fd, result, 0, length, resourceOffset)
|
|
||||||
fs.closeSync(fd)
|
|
||||||
return encoding ? result.toString(encoding) : result
|
|
||||||
},
|
|
||||||
statSync: function statSync(path: string | Buffer) {
|
|
||||||
const stat = ownStat(path)
|
|
||||||
if (stat) {
|
|
||||||
return stat
|
|
||||||
}
|
|
||||||
return originalStatSync.apply(fs, arguments)
|
|
||||||
},
|
|
||||||
stat: function stat(path: string | Buffer, callback: any) {
|
|
||||||
const stat = ownStat(path)
|
|
||||||
if (stat) {
|
|
||||||
process.nextTick(() => {
|
|
||||||
callback(null, stat)
|
|
||||||
})
|
|
||||||
} else {
|
|
||||||
return originalStat.apply(fs, arguments)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Object.assign(fs, nfs)
|
|
||||||
}
|
|
||||||
|
|
||||||
interface NexeBinary {
|
|
||||||
resources: { [key: string]: number[] }
|
|
||||||
version: string
|
|
||||||
layout: {
|
|
||||||
stat: Stats
|
|
||||||
contentSize: number
|
|
||||||
contentStart: number
|
|
||||||
resourceSize: number
|
|
||||||
resourceStart: number
|
|
||||||
}
|
|
||||||
}
|
|
||||||
+30
-24
@@ -1,12 +1,24 @@
|
|||||||
import { NexeCompiler } from '../compiler'
|
import { NexeCompiler } from '../compiler'
|
||||||
|
import { wrap } from '../util'
|
||||||
|
|
||||||
function wrap(code: string) {
|
export default async function (compiler: NexeCompiler, next: () => Promise<void>) {
|
||||||
return '!(function () {' + code + '})();'
|
await next()
|
||||||
}
|
compiler.shims.push(
|
||||||
|
wrap(
|
||||||
export default function(compiler: NexeCompiler, next: () => Promise<void>) {
|
[
|
||||||
compiler.shims.push(wrap(compiler.getHeader()))
|
'process.__nexe = {};',
|
||||||
|
'const fsPatcher = (function() {',
|
||||||
|
'const module = {exports: {}};',
|
||||||
|
'const exports = module.exports;',
|
||||||
|
'{{file("lib/fs/patch.bundle.js")}}',
|
||||||
|
'return module.exports;',
|
||||||
|
'})()',
|
||||||
|
'fsPatcher.shimFs(process.__nexe);',
|
||||||
|
compiler.options.fs ? '' : 'restoreFs();',
|
||||||
|
].join('\n')
|
||||||
|
//TODO support only restoring specific methods
|
||||||
|
)
|
||||||
|
)
|
||||||
compiler.shims.push(
|
compiler.shims.push(
|
||||||
wrap(`
|
wrap(`
|
||||||
if (process.argv[1] && process.env.NODE_UNIQUE_ID) {
|
if (process.argv[1] && process.env.NODE_UNIQUE_ID) {
|
||||||
@@ -17,21 +29,15 @@ export default function(compiler: NexeCompiler, next: () => Promise<void>) {
|
|||||||
`)
|
`)
|
||||||
)
|
)
|
||||||
|
|
||||||
if (compiler.options.resources.length) {
|
compiler.shims.push(
|
||||||
compiler.shims.push(wrap('{{replace:lib/steps/shim-fs.js}}'))
|
wrap(`
|
||||||
}
|
if (!process.send) {
|
||||||
|
const path = require('path')
|
||||||
//compiler.shims.push(wrap('{/{replace:lib/steps/shim-require.js}}'))
|
const entry = path.resolve(path.dirname(process.execPath),${JSON.stringify(
|
||||||
|
compiler.entrypoint
|
||||||
if (compiler.options.fakeArgv !== false) {
|
)})
|
||||||
const nty = !process.stdin.isTTY
|
process.argv.splice(1,0, entry)
|
||||||
const input = nty ? '[stdin]' : JSON.stringify(compiler.options.input)
|
}
|
||||||
compiler.shims.push(
|
`)
|
||||||
wrap(`
|
)
|
||||||
var r = require('path').resolve;
|
|
||||||
process.argv.splice(1,0, ${nty ? `'${input}'` : `r(${input})`});`)
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
return next()
|
|
||||||
}
|
}
|
||||||
|
|||||||
+11
-7
@@ -1,8 +1,8 @@
|
|||||||
export type NodePlatform = 'windows' | 'mac' | 'alpine' | 'linux'
|
export type NodePlatform = 'windows' | 'mac' | 'alpine' | 'linux'
|
||||||
export type NodeArch = 'x86' | 'x64'
|
export type NodeArch = 'x86' | 'x64' | 'arm' | 'arm64'
|
||||||
|
|
||||||
const platforms: NodePlatform[] = ['windows', 'mac', 'alpine', 'linux'],
|
const platforms: NodePlatform[] = ['windows', 'mac', 'alpine', 'linux'],
|
||||||
architectures: NodeArch[] = ['x86', 'x64']
|
architectures: NodeArch[] = ['x86', 'x64', 'arm', 'arm64']
|
||||||
|
|
||||||
export { platforms, architectures }
|
export { platforms, architectures }
|
||||||
|
|
||||||
@@ -12,7 +12,6 @@ export interface NexeTarget {
|
|||||||
arch: NodeArch | string
|
arch: NodeArch | string
|
||||||
}
|
}
|
||||||
|
|
||||||
//TODO bsd
|
|
||||||
const prettyPlatform: { [key: string]: NodePlatform } = {
|
const prettyPlatform: { [key: string]: NodePlatform } = {
|
||||||
win32: 'windows',
|
win32: 'windows',
|
||||||
windows: 'windows',
|
windows: 'windows',
|
||||||
@@ -22,16 +21,21 @@ const prettyPlatform: { [key: string]: NodePlatform } = {
|
|||||||
mac: 'mac',
|
mac: 'mac',
|
||||||
linux: 'linux',
|
linux: 'linux',
|
||||||
static: 'alpine',
|
static: 'alpine',
|
||||||
alpine: 'alpine'
|
alpine: 'alpine',
|
||||||
}
|
}
|
||||||
|
|
||||||
//TODO arm
|
|
||||||
const prettyArch: { [key: string]: NodeArch } = {
|
const prettyArch: { [key: string]: NodeArch } = {
|
||||||
x86: 'x86',
|
x86: 'x86',
|
||||||
|
arm6: 'arm',
|
||||||
|
arm64: 'arm64',
|
||||||
|
arm6l: 'arm',
|
||||||
|
arm: 'arm',
|
||||||
|
arm7: 'arm',
|
||||||
|
arm7l: 'arm',
|
||||||
amd64: 'x64',
|
amd64: 'x64',
|
||||||
ia32: 'x86',
|
ia32: 'x86',
|
||||||
x32: 'x86',
|
x32: 'x86',
|
||||||
x64: 'x64'
|
x64: 'x64',
|
||||||
}
|
}
|
||||||
|
|
||||||
function isVersion(x: string) {
|
function isVersion(x: string) {
|
||||||
@@ -76,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, '')
|
||||||
}
|
}
|
||||||
|
|||||||
Vendored
+2
-2
@@ -3,8 +3,8 @@ declare module 'got' {
|
|||||||
(url: string, options?: any): Promise<{ body: string }>
|
(url: string, options?: any): Promise<{ body: string }>
|
||||||
stream(url: string, optoins?: any): any
|
stream(url: string, optoins?: any): any
|
||||||
}
|
}
|
||||||
function got(url: string, options?: any): Promise<{ body: string }>
|
const got: GotFn
|
||||||
export = got as GotFn
|
export = got
|
||||||
}
|
}
|
||||||
declare module 'download' {
|
declare module 'download' {
|
||||||
import { Duplex } from 'stream'
|
import { Duplex } from 'stream'
|
||||||
|
|||||||
+39
-16
@@ -1,18 +1,21 @@
|
|||||||
import { readFile, writeFile, stat } from 'fs'
|
import { readFile, writeFile, stat } from 'fs'
|
||||||
import { execFile } from 'child_process'
|
import { execFile } from 'child_process'
|
||||||
import pify = require('pify')
|
import { promisify } from 'util'
|
||||||
import rimraf = require('rimraf')
|
import rimraf = require('rimraf')
|
||||||
|
|
||||||
const rimrafAsync = pify(rimraf)
|
const rimrafAsync = promisify(rimraf)
|
||||||
|
export const STDIN_FLAG = '[stdin]'
|
||||||
|
|
||||||
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
|
||||||
for (let i = 0; i < l.length; i++) {
|
return Promise.all(l.map(action))
|
||||||
await action(l[i], i, l)
|
}
|
||||||
}
|
|
||||||
|
export function wrap(code: string) {
|
||||||
|
return '!(function () {' + code + '})();'
|
||||||
}
|
}
|
||||||
|
|
||||||
function falseOnEnoent(e: any) {
|
function falseOnEnoent(e: any) {
|
||||||
@@ -23,12 +26,12 @@ function falseOnEnoent(e: any) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function padRight(str: string, l: number) {
|
function padRight(str: string, l: number) {
|
||||||
return (str + ' '.repeat(l)).substr(0, l)
|
return (str + ' '.repeat(l)).slice(0, l)
|
||||||
}
|
}
|
||||||
|
|
||||||
const bound: MethodDecorator = function bound<T>(
|
const bound: MethodDecorator = function bound<T>(
|
||||||
target: Object,
|
target: Object,
|
||||||
propertyKey: string,
|
propertyKey: string | Symbol,
|
||||||
descriptor: TypedPropertyDescriptor<T>
|
descriptor: TypedPropertyDescriptor<T>
|
||||||
) {
|
) {
|
||||||
const configurable = true
|
const configurable = true
|
||||||
@@ -36,9 +39,13 @@ const bound: MethodDecorator = function bound<T>(
|
|||||||
configurable,
|
configurable,
|
||||||
get(this: T) {
|
get(this: T) {
|
||||||
const value = (descriptor.value as any).bind(this)
|
const value = (descriptor.value as any).bind(this)
|
||||||
Object.defineProperty(this, propertyKey, { configurable, value, writable: true })
|
Object.defineProperty(this, propertyKey as string, {
|
||||||
|
configurable,
|
||||||
|
value,
|
||||||
|
writable: true,
|
||||||
|
})
|
||||||
return value
|
return value
|
||||||
}
|
},
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -57,27 +64,43 @@ export interface ReadFileAsync {
|
|||||||
(path: string, encoding: string): Promise<string>
|
(path: string, encoding: string): Promise<string>
|
||||||
}
|
}
|
||||||
|
|
||||||
const readFileAsync = pify(readFile)
|
const readFileAsync = promisify(readFile)
|
||||||
const writeFileAsync = pify(writeFile)
|
const writeFileAsync = promisify(writeFile)
|
||||||
const statAsync = pify(stat)
|
const statAsync = promisify(stat)
|
||||||
const execFileAsync = pify(execFile)
|
const execFileAsync = promisify(execFile)
|
||||||
const isWindows = process.platform === 'win32'
|
const isWindows = process.platform === 'win32'
|
||||||
|
|
||||||
function pathExistsAsync(path: string) {
|
function pathExistsAsync(path: string) {
|
||||||
return statAsync(path)
|
return statAsync(path)
|
||||||
.then(x => true)
|
.then((x) => true)
|
||||||
.catch(falseOnEnoent)
|
.catch(falseOnEnoent)
|
||||||
}
|
}
|
||||||
|
|
||||||
function isDirectoryAsync(path: string) {
|
function isDirectoryAsync(path: string) {
|
||||||
return statAsync(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) {
|
||||||
|
const [cMajor, cMinor, cPatch] = version.split('.').map(Number)
|
||||||
|
let [major, minor, patch] = operand.split('.').map(Number)
|
||||||
|
if (!minor) minor = 0
|
||||||
|
if (!patch) patch = 0
|
||||||
|
return (
|
||||||
|
cMajor > major ||
|
||||||
|
(cMajor === major && cMinor > minor) ||
|
||||||
|
(cMajor === major && cMinor === minor && cPatch > patch)
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
export {
|
export {
|
||||||
dequote,
|
dequote,
|
||||||
padRight,
|
padRight,
|
||||||
|
semverGt,
|
||||||
bound,
|
bound,
|
||||||
isWindows,
|
isWindows,
|
||||||
rimrafAsync,
|
rimrafAsync,
|
||||||
@@ -86,5 +109,5 @@ export {
|
|||||||
readFileAsync,
|
readFileAsync,
|
||||||
pathExistsAsync,
|
pathExistsAsync,
|
||||||
isDirectoryAsync,
|
isDirectoryAsync,
|
||||||
writeFileAsync
|
writeFileAsync,
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,101 +0,0 @@
|
|||||||
import * as nexe from '../lib/nexe'
|
|
||||||
import { getUnBuiltReleases, getLatestGitRelease } from '../lib/releases'
|
|
||||||
import * as ci from './ci'
|
|
||||||
import { runAlpineBuild } from './docker'
|
|
||||||
import { getTarget } from '../lib/target'
|
|
||||||
import { pathExistsAsync, statAsync, readFileAsync, execFileAsync } from '../lib/util'
|
|
||||||
import got = require('got')
|
|
||||||
|
|
||||||
const env = process.env,
|
|
||||||
branchName = env.CIRCLE_BRANCH || env.APPVEYOR_REPO_BRANCH || env.TRAVIS_BRANCH || '',
|
|
||||||
isScheduled = Boolean(env.APPVEYOR_SCHEDULED_BUILD || env.NEXE_TRIGGERED),
|
|
||||||
isLinux = Boolean(env.TRAVIS),
|
|
||||||
isWindows = Boolean(env.APPVEYOR),
|
|
||||||
isMac = Boolean(env.CIRCLECI),
|
|
||||||
isPullRequest =
|
|
||||||
Boolean(env.CIRCLE_PR_NUMBER) ||
|
|
||||||
Boolean(env.APPVEYOR_PULL_REQUEST_NUMBER) ||
|
|
||||||
Boolean(env.TRAVIS_PULL_REQUEST_BRANCH),
|
|
||||||
headers = {
|
|
||||||
Authorization: 'token ' + env.GITHUB_TOKEN,
|
|
||||||
'User-Agent': 'nexe (https://www.npmjs.com/package/nexe)'
|
|
||||||
}
|
|
||||||
|
|
||||||
if (require.main === module) {
|
|
||||||
if (!isPullRequest) {
|
|
||||||
build().catch(x => {
|
|
||||||
console.error(x)
|
|
||||||
process.exit(1)
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async function build() {
|
|
||||||
if (isScheduled) {
|
|
||||||
const releases = await getUnBuiltReleases({ headers })
|
|
||||||
if (!releases.length) {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
const windowsBuild = releases.find(x => x.platform === 'windows')
|
|
||||||
const macBuild = releases.find(x => x.platform === 'mac')
|
|
||||||
const linuxOrAlpine = releases.find(x => x.platform === 'linux' || x.platform === 'alpine')
|
|
||||||
|
|
||||||
if (linuxOrAlpine) {
|
|
||||||
await ci.triggerDockerBuild(linuxOrAlpine, branchName)
|
|
||||||
}
|
|
||||||
if (macBuild) {
|
|
||||||
await ci.triggerMacBuild(macBuild, branchName)
|
|
||||||
}
|
|
||||||
if (windowsBuild) {
|
|
||||||
await ci.triggerWindowsBuild(windowsBuild)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (env.NEXE_VERSION) {
|
|
||||||
const target = getTarget(env.NEXE_VERSION),
|
|
||||||
output = isWindows ? './out.exe' : './out',
|
|
||||||
options = {
|
|
||||||
empty: true,
|
|
||||||
build: true,
|
|
||||||
target,
|
|
||||||
output
|
|
||||||
}
|
|
||||||
|
|
||||||
const stop = keepalive()
|
|
||||||
if (target.platform === 'alpine') {
|
|
||||||
await runAlpineBuild(target)
|
|
||||||
} else {
|
|
||||||
await nexe.compile(options)
|
|
||||||
}
|
|
||||||
stop()
|
|
||||||
|
|
||||||
if (await pathExistsAsync(output)) {
|
|
||||||
await assertNexeBinary(output)
|
|
||||||
const gitRelease = await getLatestGitRelease({ headers })
|
|
||||||
await got(gitRelease.upload_url.split('{')[0], {
|
|
||||||
query: { name: target.toString() },
|
|
||||||
body: await readFileAsync(output),
|
|
||||||
headers: {
|
|
||||||
Authorization: 'token ' + env.GITHUB_TOKEN,
|
|
||||||
'Content-Type': 'application/octet-stream',
|
|
||||||
'User-Agent': 'nexe (https://www.npmjs.com/package/nexe)'
|
|
||||||
}
|
|
||||||
})
|
|
||||||
console.log(target + ' uploaded.')
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function keepalive() {
|
|
||||||
const keepalive = setInterval(() => console.log('Building...'), 300 * 1000)
|
|
||||||
return () => clearInterval(keepalive)
|
|
||||||
}
|
|
||||||
|
|
||||||
function assertNexeBinary(file: string) {
|
|
||||||
return execFileAsync(file).catch(e => {
|
|
||||||
if (e && e.stack && e.stack.includes('Invalid Nexe binary')) {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
throw e
|
|
||||||
})
|
|
||||||
}
|
|
||||||
+116
@@ -0,0 +1,116 @@
|
|||||||
|
import * as nexe from '../lib/nexe'
|
||||||
|
import { getUnBuiltReleases, getLatestGitRelease } from '../lib/releases'
|
||||||
|
import { runDockerBuild } from './docker'
|
||||||
|
import { getTarget, targetsEqual, NexeTarget } from '../lib/target'
|
||||||
|
import { pathExistsAsync, readFileAsync, execFileAsync, semverGt } from '../lib/util'
|
||||||
|
import got from 'got'
|
||||||
|
import { cpus } from 'os'
|
||||||
|
|
||||||
|
const env = process.env,
|
||||||
|
isPullRequest = env.BUILD_REASON === 'PullRequest',
|
||||||
|
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)',
|
||||||
|
}
|
||||||
|
|
||||||
|
if (require.main === module) {
|
||||||
|
if (!isPullRequest) {
|
||||||
|
build().catch((x) => {
|
||||||
|
console.error(x)
|
||||||
|
process.exit(1)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
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,
|
||||||
|
}
|
||||||
|
console.log('Building: ' + target + ' on ' + buildHost)
|
||||||
|
const stop = keepalive()
|
||||||
|
|
||||||
|
if (
|
||||||
|
[/*'arm7l', 'arm6l', 'arm64', */ 'alpine'].includes(target.platform) &&
|
||||||
|
buildHost.includes('alpine')
|
||||||
|
) {
|
||||||
|
await runDockerBuild(target)
|
||||||
|
} else {
|
||||||
|
await nexe.compile(options)
|
||||||
|
}
|
||||||
|
stop()
|
||||||
|
if (await pathExistsAsync(output)) {
|
||||||
|
await assertNexeBinary(output)
|
||||||
|
const gitRelease = await getLatestGitRelease({ 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], {
|
||||||
|
searchParams: { 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)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function keepalive() {
|
||||||
|
const keepalive = setInterval(() => console.log('Building...'), 300 * 1000)
|
||||||
|
return () => clearInterval(keepalive)
|
||||||
|
}
|
||||||
|
|
||||||
|
function assertNexeBinary(file: string) {
|
||||||
|
return execFileAsync(file).catch((e) => {
|
||||||
|
if (e && e.stack && e.stack.includes('Invalid Nexe binary')) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
throw e
|
||||||
|
})
|
||||||
|
}
|
||||||
-51
@@ -1,51 +0,0 @@
|
|||||||
import { NexeTarget } from '../lib/releases'
|
|
||||||
import got = require('got')
|
|
||||||
import * as assert from 'assert'
|
|
||||||
const { env } = process
|
|
||||||
|
|
||||||
export function triggerMacBuild(release: NexeTarget, branch: string) {
|
|
||||||
assert.ok(env.CIRCLE_TOKEN)
|
|
||||||
const circle = `https://circleci.com/api/v1.1/project/github/nexe/nexe/tree/${branch}?circle-token=${
|
|
||||||
env.CIRCLE_TOKEN
|
|
||||||
}`
|
|
||||||
return got(circle, {
|
|
||||||
json: true,
|
|
||||||
body: {
|
|
||||||
build_parameters: {
|
|
||||||
NEXE_VERSION: release.toString()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
export function triggerDockerBuild(release: NexeTarget, branch: string) {
|
|
||||||
assert.ok(env.TRAVIS_TOKEN)
|
|
||||||
const travis = `https://api.travis-ci.org/repo/nexe%2Fnexe/requests`
|
|
||||||
return got(travis, {
|
|
||||||
json: true,
|
|
||||||
body: {
|
|
||||||
request: {
|
|
||||||
branch: branch,
|
|
||||||
config: {
|
|
||||||
merge_mode: 'deep_merge',
|
|
||||||
env: {
|
|
||||||
//use matrix so that secure global variable is merged
|
|
||||||
matrix: {
|
|
||||||
NEXE_VERSION: release.toString()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
headers: {
|
|
||||||
'Travis-API-Version': '3',
|
|
||||||
Authorization: `token ${env.TRAVIS_TOKEN}`
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
export function triggerWindowsBuild(release: NexeTarget) {
|
|
||||||
const hasVersion = 'NEXE_VERSION' in env
|
|
||||||
env.NEXE_VERSION = hasVersion ? env.NEXE_VERSION!.trim() : release.toString()
|
|
||||||
return Promise.resolve()
|
|
||||||
}
|
|
||||||
+36
-27
@@ -1,16 +1,15 @@
|
|||||||
import { NexeTarget } from '../lib/target'
|
import { NexeTarget, architectures } from '../lib/target'
|
||||||
import { writeFileAsync, readFileAsync } from '../lib/util'
|
import { writeFileAsync, readFileAsync } from '../lib/util'
|
||||||
import { spawn } from 'child_process'
|
import got from 'got'
|
||||||
import got = require('got')
|
|
||||||
import execa = require('execa')
|
import execa = require('execa')
|
||||||
import { appendFileSync } from 'fs'
|
import { appendFileSync } from 'fs'
|
||||||
|
|
||||||
function alpine(target: NexeTarget) {
|
function alpine(target: NexeTarget) {
|
||||||
return `
|
return `
|
||||||
FROM ${target.arch === 'x64' ? '' : 'i386/'}alpine:3.4
|
FROM ${target.arch === 'x64' ? '' : 'i386/'}alpine:3.12
|
||||||
RUN apk add --no-cache curl make gcc g++ binutils-gold python linux-headers paxctl libgcc libstdc++ git vim tar gzip wget
|
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 NODE_VERSION=${target.version}
|
||||||
ENV NEXE_VERSION=beta
|
ENV NEXE_VERSION=latest
|
||||||
WORKDIR /
|
WORKDIR /
|
||||||
|
|
||||||
RUN curl -sSL https://nodejs.org/dist/v\${NODE_VERSION}/node-v\${NODE_VERSION}.tar.gz | tar -xz && \
|
RUN curl -sSL https://nodejs.org/dist/v\${NODE_VERSION}/node-v\${NODE_VERSION}.tar.gz | tar -xz && \
|
||||||
@@ -21,39 +20,49 @@ RUN curl -sSL https://nodejs.org/dist/v\${NODE_VERSION}/node-v\${NODE_VERSION}.t
|
|||||||
paxctl -cm /usr/bin/node
|
paxctl -cm /usr/bin/node
|
||||||
|
|
||||||
RUN rm /nexe_temp/\${NODE_VERSION}/out/Release/node && \
|
RUN rm /nexe_temp/\${NODE_VERSION}/out/Release/node && \
|
||||||
npm install -g nexe@\${NEXE_VERSION} && \
|
npm install -g nexe@\${NEXE_VERSION}
|
||||||
nexe --build --empty --temp /nexe_temp -c="--fully-static" -o out
|
RUN echo "console.log('hello world')" >> index.js && \
|
||||||
|
nexe --build --no-mangle --temp /nexe_temp -c="--fully-static" -o out
|
||||||
`.trim()
|
`.trim()
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function runAlpineBuild(target: NexeTarget) {
|
function arm(target: NexeTarget) {
|
||||||
await writeFileAsync('Dockerfile', alpine(target))
|
return `
|
||||||
const outFilename = 'nexe-alpine-build-log.txt'
|
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, '')
|
await writeFileAsync(outFilename, '')
|
||||||
let output: any = []
|
let output: any = []
|
||||||
|
|
||||||
try {
|
try {
|
||||||
output.push(await execa.shell(`docker build -t nexe-alpine .`))
|
output.push(await execa(`docker build -t nexe-docker .`, { shell: true }))
|
||||||
output.push(await execa.shell(`docker run -d --name nexe nexe-alpine sh`))
|
output.push(await execa(`docker run -d --name nexe nexe-docker sh`, { shell: true }))
|
||||||
output.push(await execa.shell(`docker cp nexe:/out out`))
|
output.push(await execa(`docker cp nexe:/out out`, { shell: true }))
|
||||||
output.push(await execa.shell(`docker rm nexe`))
|
output.push(await execa(`docker rm nexe`, { shell: true }))
|
||||||
} catch (e) {
|
} catch (e: any) {
|
||||||
console.log('Error running docker', e)
|
console.log('Error running docker')
|
||||||
|
appendFileSync(outFilename, e.message)
|
||||||
} finally {
|
} finally {
|
||||||
output.forEach((x: any) => {
|
output.forEach((x: any) => {
|
||||||
appendFileSync(outFilename, x.stderr)
|
appendFileSync(outFilename, x.stderr)
|
||||||
appendFileSync(outFilename, x.stdout)
|
appendFileSync(outFilename, x.stdout)
|
||||||
})
|
})
|
||||||
await got(
|
await got(`https://transfer.sh/${Math.random().toString(36).substring(2)}.txt`, {
|
||||||
`https://transfer.sh/${Math.random()
|
body: await readFileAsync(outFilename),
|
||||||
.toString(36)
|
method: 'PUT',
|
||||||
.substring(2)}.txt`,
|
})
|
||||||
{
|
.then((x) => console.log('Posted docker log: ', x.body))
|
||||||
body: await readFileAsync(outFilename),
|
.catch((e) => console.log('Error posting log', e))
|
||||||
method: 'PUT'
|
|
||||||
}
|
|
||||||
)
|
|
||||||
.then(x => console.log('Posted docker log: ', x.body))
|
|
||||||
.catch(e => console.log('Error posting log', e))
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+17
-14
@@ -1,28 +1,31 @@
|
|||||||
import { writeFileSync, readFileSync } from 'fs'
|
import { writeFileSync, readFileSync } from 'fs'
|
||||||
|
import { template } from 'lodash'
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* post build step to insert code files into code files.
|
* post build step to insert code files into code files.
|
||||||
* '{{replace:path/to/file}}' => "file contents"
|
|
||||||
* And the package.json version.
|
* And the package.json version.
|
||||||
*/
|
*/
|
||||||
//inject('plugins/nexe-daemon/lib/index.js')
|
cp('src/fs/package.json', 'lib/fs/package.json')
|
||||||
|
cp('src/fs/bootstrap.js', 'lib/fs/bootstrap.js')
|
||||||
|
cp('src/fs/README.md', 'lib/fs/README.md')
|
||||||
|
|
||||||
inject('lib/patches/third-party-main.js')
|
inject('lib/patches/third-party-main.js')
|
||||||
inject('lib/steps/shim.js')
|
inject('lib/steps/shim.js')
|
||||||
inject('lib/options.js', JSON.stringify(require('../package.json').version))
|
inject('lib/options.js', JSON.stringify(require('../package.json').version))
|
||||||
|
|
||||||
function inject(filename: string, ...replacements: string[]) {
|
function inject(filename: string, version?: string) {
|
||||||
let contents = readFileSync(filename, 'utf8')
|
const contents = template(readFileSync(filename, 'utf8'), {
|
||||||
contents = contents.replace(/('{{(.*)}}')/g, (substring: string, ...matches: string[]) => {
|
interpolate: /'\{\{([\s\S]*?)\}\}'/,
|
||||||
if (!matches || !matches[1]) {
|
})({
|
||||||
return substring
|
file: (path: string) => JSON.stringify(readFileSync(path, 'utf8')),
|
||||||
}
|
version,
|
||||||
const [replace, file] = matches[1].split(':')
|
|
||||||
if (replace !== 'replace') {
|
|
||||||
return substring
|
|
||||||
}
|
|
||||||
console.log('Replacing: ', substring)
|
|
||||||
return replacements[+file] ? replacements[+file] : JSON.stringify(readFileSync(file, 'utf8'))
|
|
||||||
})
|
})
|
||||||
writeFileSync(filename, contents)
|
writeFileSync(filename, contents)
|
||||||
console.log(`Wrote: ${filename}`)
|
console.log(`Wrote: ${filename}`)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function cp(from: string, to: string) {
|
||||||
|
const file = readFileSync(from)
|
||||||
|
writeFileSync(to, file)
|
||||||
|
console.log('Copied: ', from, 'To: ', to)
|
||||||
|
}
|
||||||
|
|||||||
@@ -0,0 +1,10 @@
|
|||||||
|
{
|
||||||
|
"extends": "../tsconfig.json",
|
||||||
|
"compilerOptions": {
|
||||||
|
"noEmit": true
|
||||||
|
},
|
||||||
|
"include":[
|
||||||
|
"*.ts"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
module.exports = 'abc'
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
console.log('hello world', require('./dependency'))
|
||||||
@@ -1,3 +1,3 @@
|
|||||||
{
|
{
|
||||||
"main": "entry-file.js"
|
"main": "entry.js"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,23 @@
|
|||||||
|
const { mkdtemp, copyFile } = require('fs/promises')
|
||||||
|
const os = require('os')
|
||||||
|
const path = require('path')
|
||||||
|
const rimraf = require('rimraf')
|
||||||
|
const cp = require('child_process')
|
||||||
|
|
||||||
|
async function runTests() {
|
||||||
|
const tempdir = await mkdtemp(path.join(os.tmpdir(), 'nexe-integration-tests-'))
|
||||||
|
const executable = path.join(tempdir, path.basename(process.argv[0]))
|
||||||
|
await copyFile(process.argv[0], executable)
|
||||||
|
process.on('beforeExit', () => rimraf.sync(tempdir))
|
||||||
|
cp.spawn(executable,
|
||||||
|
[
|
||||||
|
path.join(tempdir, 'node_modules/mocha/bin/mocha.js'),
|
||||||
|
path.join(tempdir, 'test/integration/tests.integration-spec.js')
|
||||||
|
],
|
||||||
|
{ stdio: ['inherit', 'inherit', 'inherit', 'ipc'], cwd: tempdir }
|
||||||
|
).on('exit', (code) => {
|
||||||
|
process.exitCode = code
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
runTests()
|
||||||
@@ -0,0 +1,120 @@
|
|||||||
|
const { expect } = require('chai')
|
||||||
|
const fs = require('fs')
|
||||||
|
const { dirname, basename } = require('path')
|
||||||
|
|
||||||
|
const files = { zipFs: 'test/integration/tests.integration-spec.js', real: 'real', real2: 'real2' }
|
||||||
|
describe('SnapshotZipFS', () => {
|
||||||
|
console.error('Note: these tests are order dependant, so subsequent failures are likely a flow on effect.')
|
||||||
|
it('checks existance from the zipFs', () => expect(fs.existsSync(files.zipFs)).to.equal(true))
|
||||||
|
it('checks non-existance from the zipFs', () => expect(fs.existsSync('not found')).to.equal(false))
|
||||||
|
it('reads from the zipFs', () => expect(fs.readFileSync(files.zipFs, 'utf8')).to.include('SnapshotZipFS'))
|
||||||
|
it('copies from the zipFs', () => expect(() => fs.copyFileSync(files.zipFs, files.real)).not.to.throw())
|
||||||
|
it('reads from the real fs', () => expect(fs.readFileSync(files.real, 'utf8')).to.include('SnapshotZipFS'))
|
||||||
|
it('checks non-existance from the real fs', () => expect(fs.existsSync(files.real2)).to.equal(false))
|
||||||
|
it('copies from the real fs', () => expect(() => fs.copyFileSync(files.real, files.real2)).not.to.throw())
|
||||||
|
it('checks existance from the real fs', () => expect(fs.existsSync(files.real2)).to.equal(true))
|
||||||
|
it('unlinks from the real fs', () => expect(() => fs.unlinkSync(files.real2)).not.to.throw())
|
||||||
|
it('symlinks the real fs', () => expect(() => fs.symlinkSync('tmp', files.real2)).not.to.throw())
|
||||||
|
it('readlinks the real fs', () => expect(fs.readlinkSync(files.real2)).to.equal('tmp'))
|
||||||
|
it('truncates the real fs', () => expect(() => fs.truncateSync(files.real)).not.to.throw())
|
||||||
|
it('writeFiles the real fs', () => expect(() => fs.writeFileSync(files.real2, 'testing')).not.to.throw())
|
||||||
|
it('accesses the real fs', () => expect(() => fs.accessSync(files.real)).not.to.throw())
|
||||||
|
it('accesses the zipFs', () => expect(() => fs.accessSync(files.zipFs)).not.to.throw())
|
||||||
|
it('stats the real fs', () => expect(fs.statSync(files.real2).size).to.be.greaterThan(0))
|
||||||
|
it('stats the zipFs', () => expect(fs.statSync(files.zipFs).size).to.be.greaterThan(0))
|
||||||
|
it('readdirs from the zipFs', () => expect(fs.readdirSync(dirname(files.zipFs))).to.include(basename(files.zipFs)))
|
||||||
|
it('readdirs from the real fs', () => expect(fs.readdirSync('.')).to.include(files.real))
|
||||||
|
it('readdirs from both', () => {
|
||||||
|
expect(fs.readdirSync('.')).to.include(files.real),
|
||||||
|
expect(fs.readdirSync('.')).to.include('test')
|
||||||
|
})
|
||||||
|
let dir
|
||||||
|
it('opendirs the zipFs fs', async () => {
|
||||||
|
expect(() => dir = fs.opendirSync(dirname(files.zipFs))).not.to.throw()
|
||||||
|
const names = []
|
||||||
|
for await (const dirent of dir) {
|
||||||
|
names.push(dirent.name)
|
||||||
|
}
|
||||||
|
expect(names).to.include(basename(files.zipFs))
|
||||||
|
})
|
||||||
|
it('opendirs the real fs and zipFs', async () => {
|
||||||
|
expect(() => dir = fs.opendirSync('.')).not.to.throw()
|
||||||
|
const names = []
|
||||||
|
for await (const dirent of dir) {
|
||||||
|
names.push(dirent.name)
|
||||||
|
}
|
||||||
|
expect(names).to.include(files.real)
|
||||||
|
expect(names).to.include('test')
|
||||||
|
})
|
||||||
|
it('createWriteStreams to the real fs', () => expect(() => fs.createWriteStream('createWriteStream')).not.to.throw())
|
||||||
|
it('createReadStreams to the real fs', () => expect(() => fs.createReadStream(files.real)).not.to.throw())
|
||||||
|
it('createReadStreams to the zipFs', () => expect(() => fs.createReadStream(files.zipFs)).not.to.throw())
|
||||||
|
it('renames to the realFs', () => {
|
||||||
|
expect(() => fs.renameSync(files.real2, 'rename')).not.to.throw()
|
||||||
|
expect(fs.existsSync('rename')).to.equal(true)
|
||||||
|
})
|
||||||
|
|
||||||
|
describe('write actions to the zipFs', () => {
|
||||||
|
it(`won't truncate to the zipFs`, () => expect(() => fs.truncateSync(files.zipFs)).to.throw())
|
||||||
|
it(`won't unlink from the zipFs`, () => expect(() => fs.unlinkSync(files.zipFs)).to.throw())
|
||||||
|
it(`won't appendFile to the zipFs`, () => expect(() => fs.appendFileSync(files.zipFs, 'xxx')).to.throw())
|
||||||
|
it(`won't symlink to the zipFs`, () => expect(() => fs.symlinkSync('tmp', files.zipFs)).to.throw())
|
||||||
|
it(`won't chmod to the zipFs`, () => expect(() => fs.chmodSync(files.zipFs, 0o666)).to.throw())
|
||||||
|
it(`won't chown to the zipFs`, () => expect(() => fs.chownSync(files.zipFs, 0, 0)).to.throw())
|
||||||
|
it(`won't writeFile the zipFs`, () => expect(() => fs.writeFileSync(files.zipFs, 'testing')).to.throw())
|
||||||
|
it(`won't createWriteStreams to the zipFs`, () => expect(() => fs.createWriteStream(files.zipFs)).to.throw())
|
||||||
|
it(`won't rename to the zipFs`, () => expect(() => fs.renameSync(files.real, files.zipFs)).to.throw())
|
||||||
|
})
|
||||||
|
|
||||||
|
;[ 'zipFs', 'real' ].forEach((k) => {
|
||||||
|
it(`watches the ${k} fs`, () => expect(() => fs.watch(files[k], () => null).close()).not.to.throw())
|
||||||
|
it(`watchFiles the ${k} fs`, () => expect(() => fs.watchFile(files[k], () => null)).not.to.throw())
|
||||||
|
it(`unwatchFiles the ${k} fs`, () => expect(() => fs.unwatchFile(files[k])).not.to.throw())
|
||||||
|
})
|
||||||
|
let buffer = Buffer.alloc(8092), fd
|
||||||
|
describe('zipfs file descriptors', () => {
|
||||||
|
it('opens files in the zipFs', () => {
|
||||||
|
expect(() => (fd = fs.openSync(files.zipFs, 'a+'))).not.to.throw()
|
||||||
|
expect(fd).to.not.be.null
|
||||||
|
})
|
||||||
|
it('reads file descriptors from the zipFs', () => {
|
||||||
|
expect(() => fs.readSync(fd, buffer)).not.to.throw()
|
||||||
|
expect(buffer.toString()).to.include('SnapshotZipFS')
|
||||||
|
})
|
||||||
|
it('fstats the zipFs', () => expect(fs.fstatSync(fd).size).to.be.greaterThan(0))
|
||||||
|
it(`won't write to the zipFs`, () => expect(() => fs.writeSync(fd, 'xxx')).to.throw())
|
||||||
|
it(`won't fchmod the zipFs`, () => expect(() => fs.fchmodSync(fd)).to.throw())
|
||||||
|
it(`won't fchown the zipFs`, () => expect(() => fs.fchownSync(fd)).to.throw())
|
||||||
|
it(`won't ftruncate the zipFs`, () => expect(() => fs.ftruncateSync(fd)).to.throw())
|
||||||
|
it('closes file descriptors from the zipFs', () => expect(() => fs.closeSync(fd)).not.to.throw())
|
||||||
|
})
|
||||||
|
fd = null
|
||||||
|
buffer = Buffer.alloc(8092)
|
||||||
|
describe('real file descriptors', () => {
|
||||||
|
it('opens files in the real fs', () => {
|
||||||
|
expect(() => (fd = fs.openSync(files.real2, 'a+'))).not.to.throw()
|
||||||
|
expect(fd).to.not.be.null
|
||||||
|
})
|
||||||
|
it('reads file descriptors from the real fs', () => {
|
||||||
|
expect(() => fs.readSync(fd, buffer)).not.to.throw()
|
||||||
|
expect(buffer.toString()).to.include('SnapshotZipFS')
|
||||||
|
})
|
||||||
|
it('will write to the real fs', () => expect(() => fs.writeSync(fd, 'xxx')).not.to.throw())
|
||||||
|
it('fstats the real fs', () => expect(fs.fstatSync(fd).size).to.be.greaterThan(0))
|
||||||
|
it('closes file descriptors from the real fs', () => expect(() => fs.closeSync(fd)).not.to.throw())
|
||||||
|
})
|
||||||
|
describe('path clashes', () => {
|
||||||
|
it('delegates directory creation to the real fs', () => expect(() => fs.mkdirSync('test')).not.to.throw())
|
||||||
|
it('delegates directory removal to the real fs', () => expect(() => fs.rmdirSync('test')).not.to.throw())
|
||||||
|
})
|
||||||
|
describe('requiring modules', () => {
|
||||||
|
it('resolves modules from the zipFs', () => expect(() => require('resolve-dependencies')).not.to.throw())
|
||||||
|
it('resolves modules from the real fs', () => {
|
||||||
|
fs.mkdirSync('node_modules')
|
||||||
|
fs.mkdirSync('node_modules/fake-package')
|
||||||
|
fs.writeFileSync('node_modules/fake-package/package.json', '{ "name": "fake-package", "main": "some-file.js"}')
|
||||||
|
fs.writeFileSync('node_modules/fake-package/some-file.js', `module.exports = { fake: 'package' }`)
|
||||||
|
expect(require('fake-package')).to.eql({ fake: 'package' })
|
||||||
|
})
|
||||||
|
})
|
||||||
|
})
|
||||||
@@ -1,4 +0,0 @@
|
|||||||
./test/**/*.spec.ts
|
|
||||||
--check-leaks
|
|
||||||
--require ts-node/register
|
|
||||||
--recursive
|
|
||||||
+46
-14
@@ -8,25 +8,57 @@ describe('options', () => {
|
|||||||
describe('cwd', () => {
|
describe('cwd', () => {
|
||||||
it('should use process.cwd() if nothing is provided', () => {
|
it('should use process.cwd() if nothing is provided', () => {
|
||||||
const options = normalizeOptions()
|
const options = normalizeOptions()
|
||||||
expect(options.cwd).to.equal(process.cwd())
|
expect(options.cwd).to.equal(process.cwd())
|
||||||
})
|
})
|
||||||
it('should use the main module in a package directory', () => {
|
it('should use the main module in a package directory (if not in a TTY)', () => {
|
||||||
const options = normalizeOptions()
|
const options = normalizeOptions()
|
||||||
expect(options.input).to.equal(path.resolve('./index.js'))
|
if (!process.stdin.isTTY) {
|
||||||
|
expect(options.input).to.equal('[stdin]')
|
||||||
|
} else {
|
||||||
|
expect(options.input).to.equal(path.resolve('./index.js'))
|
||||||
|
}
|
||||||
|
})
|
||||||
|
it('should resolve relative paths for input', () => {
|
||||||
|
const options = normalizeOptions({ input: 'test/fixture/entry.js' })
|
||||||
|
expect(options.input).to.equal(path.resolve('./test/fixture/entry.js'))
|
||||||
|
})
|
||||||
|
it('should accept a module entry as input', () => {
|
||||||
|
const options = normalizeOptions({ input: 'test/fixture' })
|
||||||
|
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 = '/a/b/c'
|
const cwd = path.join(process.cwd(), 'test/fixture')
|
||||||
const options = normalizeOptions({
|
const options = normalizeOptions({
|
||||||
cwd,
|
cwd,
|
||||||
input: '123.js',
|
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, '123.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({
|
||||||
@@ -36,13 +68,13 @@ describe('options', () => {
|
|||||||
})
|
})
|
||||||
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: 'src/folder/app.js'
|
input: './test/fixture'
|
||||||
})
|
})
|
||||||
expect(options.output).to.equal(path.resolve(`./app${ext}`))
|
expect(options.output).to.equal(path.resolve(`./entry${ext}`))
|
||||||
})
|
})
|
||||||
it('should default to the folder/project name if filename is index', () => {
|
it('should default to the folder/project name if filename is index', () => {
|
||||||
const options = normalizeOptions()
|
const options = normalizeOptions({ cwd: './test/fixture2' })
|
||||||
expect(options.output).to.equal(path.resolve(`./nexe${ext}`))
|
expect(options.output).to.equal(path.resolve(`./test/fixture2/fixture2${ext}`))
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|||||||
+4
-5
@@ -1,12 +1,12 @@
|
|||||||
import { padRight, isWindows } from '../src/util'
|
import { padRight, isWindows } from '../src/util'
|
||||||
import { expect } from 'chai'
|
import { expect } from 'chai'
|
||||||
import { blue as b } from 'chalk'
|
import chalk from 'chalk'
|
||||||
import { getTarget, NexeTarget } from '../src/target'
|
import { getTarget, NexeTarget } from '../src/target'
|
||||||
|
const b = chalk.blue
|
||||||
const arch = process.arch === 'ia32' ? 'x86' : process.arch
|
const arch = process.arch === 'ia32' ? 'x86' : process.arch
|
||||||
|
|
||||||
describe('Targets', () => {
|
describe('Targets', () => {
|
||||||
[
|
;[
|
||||||
['win-ia32-6.11.2', 'windows-x86-6.11.2'],
|
['win-ia32-6.11.2', 'windows-x86-6.11.2'],
|
||||||
[{ version: '6.11.2', platform: 'win', arch: 'ia32' }, 'windows-x86-6.11.2'],
|
[{ version: '6.11.2', platform: 'win', arch: 'ia32' }, 'windows-x86-6.11.2'],
|
||||||
['win32-x64-6.11.2', 'windows-x64-6.11.2'],
|
['win32-x64-6.11.2', 'windows-x64-6.11.2'],
|
||||||
@@ -23,8 +23,7 @@ describe('Targets', () => {
|
|||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|
||||||
it ('should stringify and toString', () => {
|
it('should stringify and toString', () => {
|
||||||
expect(JSON.stringify(getTarget(process))).to.equal(`"${getTarget(process)}"`)
|
expect(JSON.stringify(getTarget(process))).to.equal(`"${getTarget(process)}"`)
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|||||||
+4
-2
@@ -1,8 +1,10 @@
|
|||||||
{
|
{
|
||||||
"compilerOptions": {
|
"compilerOptions": {
|
||||||
"target":"es5",
|
"target":"es2015",
|
||||||
|
"skipLibCheck": true,
|
||||||
"experimentalDecorators": true,
|
"experimentalDecorators": true,
|
||||||
"lib": ["es2017"],
|
"esModuleInterop": true,
|
||||||
|
"lib": ["es2018"],
|
||||||
"module": "commonjs",
|
"module": "commonjs",
|
||||||
"outDir": "./lib",
|
"outDir": "./lib",
|
||||||
"strict": true
|
"strict": true
|
||||||
|
|||||||
@@ -0,0 +1,9 @@
|
|||||||
|
{
|
||||||
|
"rulesDirectory": ["tslint-plugin-prettier", "tslint-config-prettier"],
|
||||||
|
"linterOptions": {
|
||||||
|
"exclude": ["**/node_modules/**/*"]
|
||||||
|
},
|
||||||
|
"rules": {
|
||||||
|
"prettier": [true, { "semi": false, "printWidth": 100, "singleQuote": true }]
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
import * as wcp from 'webpack-config-prefabs'
|
||||||
|
export = wcp.nodeLibrary(module, {
|
||||||
|
enableTypescript: true,
|
||||||
|
entry: './src/fs/patch.ts',
|
||||||
|
minimize: false,
|
||||||
|
outputFilepath: './lib/fs/patch.bundle.js',
|
||||||
|
});
|
||||||
Reference in New Issue
Block a user