Compare commits

..

15 Commits

Author SHA1 Message Date
calebboyd 6a9434e1ff fix: cleanup zip finalization 2023-04-04 09:12:07 -05:00
Bryce Gibson 049fda37ac WIP: ensure the stream is consumed before end/close are emitted. 2023-04-03 09:10:23 +10:00
calebboyd 7febbbd89d feat: stream zip files to destination binary 2023-04-02 12:06:26 -05:00
calebboyd 5d5513d264 refactor: compile with esmoudle interop 2023-04-02 12:02:35 -05:00
calebboyd 7a8625d92b refactor: move lodash to dev deps 2023-04-02 12:01:44 -05:00
Bryce Gibson ec8597c124 Remove highland as a dependency. 2023-03-29 10:39:35 +11:00
Bryce Gibson 053712c8d3 Fix tsc on Windows - globbing doesn't work there.
There's probably a cleaner way to do this...
2023-03-29 10:39:35 +11:00
Bryce Gibson 60747897dc Try running the integration test. 2023-03-29 10:39:35 +11:00
Bryce Gibson 59c03cd2f5 Attempt to fix ci. 2023-03-29 10:39:35 +11:00
Bryce Gibson cccf51f9bf Add test suite using the built artefact.
Smoke tests the different fs methods.

Not perfect in any world, but better than nothing.
2023-03-29 10:39:32 +11:00
Bryce Gibson 25626c8d92 Use yarn's fslib to implement the fake filesystem.
Leverage the work done by yarn, rather than reimplementing from scratch.

This means the fake fs is now reading from a zip file in the binary.

A few methods need custom implementations as the fake fs is not
writable. These were copied and adjusted from the yarn ZipOpenFS.
2023-03-27 17:15:10 +11:00
Bryce Gibson ba3b91eaf1 Generate zip file bundle. 2023-03-22 20:46:19 +11:00
Bryce Gibson fc09a7d903 Rigidify code replacement by using Lodash templates. 2023-03-22 20:46:18 +11:00
Bryce Gibson bbaa63767d Fix got typescript issues. 2023-03-22 20:44:54 +11:00
Bryce Gibson c3baa1c2a3 Update types to fix rimraf promisify. 2023-03-22 20:44:52 +11:00
67 changed files with 8003 additions and 6538 deletions
-4
View File
@@ -1,4 +0,0 @@
FROM node:fermium-alpine3.10
RUN apk add --no-cache build-base linux-headers bash clang python3
SHELL ["/bin/bash", "--login", "-c"]
CMD ["bash"]
-16
View File
@@ -1,16 +0,0 @@
# action.yml
name: 'Hello World'
description: 'Greet someone and record the time'
inputs:
who-to-greet: # id of input
description: 'Who to greet'
required: true
default: 'World'
outputs:
time: # id of output
description: 'The time we greeted you'
runs:
using: 'docker'
image: 'Dockerfile'
args:
- ${{ inputs.who-to-greet }}
-23
View File
@@ -1,23 +0,0 @@
FROM centos:7
RUN yum install -y which centos-release-scl && \
yum install -y devtoolset-9-gcc \
devtoolset-9-gcc-c++ \
make \
wget \
python3 && \
echo "source /opt/rh/devtoolset-9/enable" >> /etc/bashrc
SHELL ["/bin/bash", "--login", "-c"]
ADD flags.sh flags.sh
ARG NODE_VERSION=14.20.0
RUN wget https://nodejs.org/dist/v${NODE_VERSION}/node-v${NODE_VERSION}.tar.gz -O node.tar.gz && \
mkdir node && tar -zxf node.tar.gz -C node --strip-components=1 && \
rm node.tar.gz && \
cd node && \
. ../flags.sh && \
./configure $(echo $CONFIGURE_FLAGS) && \
make $(echo $MAKE_FLAGS) && make install
-16
View File
@@ -1,16 +0,0 @@
# action.yml
name: 'Hello World'
description: 'Greet someone and record the time'
inputs:
who-to-greet: # id of input
description: 'Who to greet'
required: true
default: 'World'
outputs:
time: # id of output
description: 'The time we greeted you'
runs:
using: 'docker'
image: 'Dockerfile'
args:
- ${{ inputs.who-to-greet }}
-18
View File
@@ -1,18 +0,0 @@
#!/bin/bash
ARCH=$(uname -m)
case $ARCH in
"x86_64")
CONFIGURE_FLAGS="--dest-cpu=x64"
;;
"aarch64")
;&
"armv7l")
CONFIGURE_FLAGS="--openssl-no-asm --dest-cpu=arm --with-arm-float-abi=hard"
;;
*)
CONFIGURE_FLAGS=""
;;
esac
MAKE_FLAGS="-j$(getconf _NPROCESSORS_ONLN)"
@@ -6,6 +6,7 @@ on:
issue_comment: issue_comment:
types: [created] types: [created]
schedule: schedule:
# 9AM Central
- cron: '0 14 * * *' - cron: '0 14 * * *'
jobs: jobs:
-52
View File
@@ -1,52 +0,0 @@
name: Base Builds
on:
push:
branches:
- refactor-old-node
jobs:
build:
strategy:
fail-fast: false
matrix:
version: ['14.20.0', '16.16.0', '18.5.0']
arch: [x64, x86]
plat: [arm, macos, windows, linux, alpine]
exclude:
- plat: arm
arch: x86
- plat: macos
arch: x86
include:
- plat: arm
os: ubuntu-20.04
- plat: macos
os: macos-12
- plat: windows
os: windows-2022
- plat: linux
os: ubuntu-20.04
- plat: alpine
os: ubuntu-20.04
name: 'Target: ${{matrix.plat}}-${{ matrix.arch }}-${{ matrix.version }} on ${{ matrix.os }}'
runs-on: ${{ matrix.os }}
steps:
- name: Setup Python
uses: actions/setup-python@v3.1.2
with:
python-version: '3.10.4'
- name: Setup Nasm
if: ${{ matrix.plat == 'windows' }}
uses: ilammy/setup-nasm@v1.3.0
- uses: actions/setup-node@v3
with:
node-version: ${{ matrix.version }}
- uses: actions/checkout@v3
with:
node-version: 18
- name: 'Install Dependencies'
run: npm ci
- name: 'Build nexe base binary'
env:
NEXE_TARGET: ${{ matrix.plat }}-${{ matrix.arch }}-${{ matrix.version }}
run: npx ts-node tasks/build.ts
-1
View File
@@ -1 +0,0 @@
18.12.1
-19
View File
@@ -1,19 +0,0 @@
{
"module": {
"type": "commonjs",
"ignoreDynamic": true
},
"jsc": {
"parser": {
"syntax": "typescript",
"dynamicImport": true,
"decorators": true
},
"transform": {
"legacyDecorator": true
},
"target": "es2019",
"externalHelpers": false
}
}
+1 -4
View File
@@ -1,6 +1,3 @@
{ {
"recommendations": [ "recommendations": [ "ms-vscode.vscode-typescript-tslint-plugin" ]
"esbenp.prettier-vscode",
"dbaeumer.vscode-eslint"
]
} }
+4 -28
View File
@@ -1,4 +1,7 @@
{ {
"tslint.enable": true,
"tslint.run": "onType",
"tslint.autoFixOnSave": true,
"files.exclude": { "files.exclude": {
"**/.git": true, "**/.git": true,
"**/.svn": true, "**/.svn": true,
@@ -11,32 +14,5 @@
"**/node_modules": true, "**/node_modules": true,
"**/bower_components": true "**/bower_components": true
}, },
"eslint.workingDirectories": [{ "mode": "auto" }], "typescript.tsdk": "node_modules\\typescript\\lib"
"eslint.format.enable": true,
"editor.formatOnSave": true,
"eslint.validate": [
"javascript",
"javascriptreact",
"typescript",
"typescriptreact"
],
"[javascript]": {
"editor.formatOnSave": true,
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"[javascriptreact]": {
"editor.formatOnSave": true,
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"[typescript]": {
"editor.formatOnSave": true,
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"[typescriptreact]": {
"editor.formatOnSave": true,
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"editor.codeActionsOnSave": {
"source.fixAll.eslint": true
}
} }
+1 -1
View File
@@ -1,4 +1,4 @@
Copyright (c) 2013-2022 Nexe Contributors Copyright (c) 2013-2018 Nexe Contributors
Permission is hereby granted, free of charge, to any person obtaining Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the a copy of this software and associated documentation files (the
+26 -6
View File
@@ -23,7 +23,7 @@
- Distribute binaries without needing node / npm. - Distribute binaries without needing node / npm.
- Idempotent builds - Idempotent builds
- Start and deploy faster. - Start and deploy faster.
- Lock-down specific application versions, and easily rollback. - Lockdown specific application versions, and easily rollback.
- Flexible build pipeline - Flexible build pipeline
- Cross platform builds - Cross platform builds
@@ -79,6 +79,7 @@ npm config set python python3.8
Where `2019` is the version of Visual Studio you have (if you have it). Where `2019` is the version of Visual Studio you have (if you have it).
**Notes:** **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 - 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. - 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.
@@ -116,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-18.1.0'` - An object or string describing platform-arch-version. e.g. `'windows-ia32-10.13.0'`
- each segment is optional, and will be merged with the current environment - each segment is optional, and will be merged with the current environment
- Examples: ([full list](https://github.com/nexe/nexe/releases)) - Examples: ([full list](https://github.com/nexe/nexe/releases))
- `'win32-x86-18.1.0` - `'win32-x86-10.13.0`
- `{ platform: 'alpine' }` - `{ platform: 'alpine' }`
- `darwin-14.19.1` - `darwin-10.13.0`
- `linux-x64` - `linux-x64`
- `macos-16.15.0` - `macos-10.13.0`
See [test/target.spec.ts](test/target.spec.ts) See [test/target.spec.ts](test/target.spec.ts)
- If the [`build`](#build-boolean) flag is set, the platform portion of the target is ignored. - If the [`build`](#build-boolean) flag is set, the platform portion of the target is ignored.
@@ -170,6 +171,9 @@ compile({
- #### `vcBuild: string[]` - #### `vcBuild: string[]`
- Options for windows build - Options for windows build
- default: `['nosign', 'release']` - default: `['nosign', 'release']`
- #### `snapshot: string`
- path to a file to be used as the warmup snapshot for the build
- default: `null`
- #### `resources: string[]` - #### `resources: string[]`
- Array of globs with files to include in the build - Array of globs with files to include in the build
- Example: `['./public/**/*']` - Example: `['./public/**/*']`
@@ -178,6 +182,20 @@ compile({
- Path to use for storing nexe's build files - Path to use for storing nexe's build files
- Override in the env with `NEXE_TEMP` - Override in the env with `NEXE_TEMP`
- default: `~/.nexe` - default: `~/.nexe`
- #### `ico: string`
- Path to a user provided icon to be used (Windows only). Requires `--build` to be set.
- #### `rc: object`
- Settings for patching the [node.rc](https://github.com/nodejs/node/blob/master/src/res/node.rc) configuration file (Windows only).
- Example (keys may vary depending on the version. Reference the file linked above):
```javascript
{
CompanyName: "ACME Corp",
PRODUCTVERSION: "17,3,0,0",
FILEVERSION: "1,2,3,4"
...
}
```
- default: `{}`
- #### `clean: boolean` - #### `clean: boolean`
- If included, nexe will remove temporary files for the accompanying configuration and exit - If included, nexe will remove temporary files for the accompanying configuration and exit
- #### `enableNodeCli: boolean` - #### `enableNodeCli: boolean`
@@ -236,12 +254,14 @@ In order to use native modules, the native binaries must be shipped alongside th
## Troubleshooting ## Troubleshooting
`Error: Entry file "" not found!` means you need to provide `nexe` with input. Either use `-i` or pipe data to it.
`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: `Error: https://github.com/nexe/nexe/releases/download/v3.3.3/windows-x64-15.8.0 is not available, create it using the --build flag` or similar message means that it either:
- You are having networking issues such as the download being blocked - You are having networking issues such as the download being blocked
- You should specify the target so `nexe` knows what version of the executable to use. - 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 - See the [releases page](https://github.com/nexe/nexe/releases) to find the executable's version number
- Example - Example
- `nexe -i "app.js" -r "public/**/*.html" -o "dist/myApp.exe" -t x64-18.1.0` - `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. - 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 - Alternatively you can compile the executable yourself, see that section for details
+73
View File
@@ -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: ''
-13
View File
@@ -1,13 +0,0 @@
FROM centos:7
RUN yum install -y which centos-release-scl \
&& yum install -y devtoolset-9-gcc \
devtoolset-9-gcc-c++ \
make \
python3 \
curl \
&& curl -sL https://rpm.nodesource.com/setup_16.x | bash - \
&& yum install -y nodejs && npm install nexe -g \
&& echo "source /opt/rh/devtoolset-9/enable" >> /etc/bashrc
SHELL ["/bin/bash", "--login", "-c"]
-4
View File
@@ -1,4 +0,0 @@
FROM node:16-alpine
RUN apk add --no-cache build-base linux-headers bash clang python3
SHELL ["/bin/bash", "--login", "-c"]
CMD ["bash"]
+8
View File
@@ -0,0 +1,8 @@
const express = require('express')
const path = require('path')
const app = express()
app.use('/', express.static(path.join(__dirname, 'public')))
app.listen(8888)
+373
View File
@@ -0,0 +1,373 @@
{
"name": "express-app",
"version": "1.0.0",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
"accepts": {
"version": "1.3.5",
"resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.5.tgz",
"integrity": "sha1-63d99gEXI6OxTopywIBcjoZ0a9I=",
"requires": {
"mime-types": "~2.1.18",
"negotiator": "0.6.1"
}
},
"array-flatten": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
"integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI="
},
"body-parser": {
"version": "1.18.2",
"resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.18.2.tgz",
"integrity": "sha1-h2eKGdhLR9hZuDGZvVm84iKxBFQ=",
"requires": {
"bytes": "3.0.0",
"content-type": "~1.0.4",
"debug": "2.6.9",
"depd": "~1.1.1",
"http-errors": "~1.6.2",
"iconv-lite": "0.4.19",
"on-finished": "~2.3.0",
"qs": "6.5.1",
"raw-body": "2.3.2",
"type-is": "~1.6.15"
}
},
"bytes": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
"integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg="
},
"content-disposition": {
"version": "0.5.2",
"resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.2.tgz",
"integrity": "sha1-DPaLud318r55YcOoUXjLhdunjLQ="
},
"content-type": {
"version": "1.0.4",
"resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
"integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA=="
},
"cookie": {
"version": "0.3.1",
"resolved": "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz",
"integrity": "sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s="
},
"cookie-signature": {
"version": "1.0.6",
"resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
"integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw="
},
"debug": {
"version": "2.6.9",
"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
"requires": {
"ms": "2.0.0"
}
},
"depd": {
"version": "1.1.2",
"resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
"integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak="
},
"destroy": {
"version": "1.0.4",
"resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
"integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA="
},
"ee-first": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
"integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0="
},
"encodeurl": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
"integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k="
},
"escape-html": {
"version": "1.0.3",
"resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
"integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg="
},
"etag": {
"version": "1.8.1",
"resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
"integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc="
},
"express": {
"version": "4.16.3",
"resolved": "https://registry.npmjs.org/express/-/express-4.16.3.tgz",
"integrity": "sha1-avilAjUNsyRuzEvs9rWjTSL37VM=",
"requires": {
"accepts": "~1.3.5",
"array-flatten": "1.1.1",
"body-parser": "1.18.2",
"content-disposition": "0.5.2",
"content-type": "~1.0.4",
"cookie": "0.3.1",
"cookie-signature": "1.0.6",
"debug": "2.6.9",
"depd": "~1.1.2",
"encodeurl": "~1.0.2",
"escape-html": "~1.0.3",
"etag": "~1.8.1",
"finalhandler": "1.1.1",
"fresh": "0.5.2",
"merge-descriptors": "1.0.1",
"methods": "~1.1.2",
"on-finished": "~2.3.0",
"parseurl": "~1.3.2",
"path-to-regexp": "0.1.7",
"proxy-addr": "~2.0.3",
"qs": "6.5.1",
"range-parser": "~1.2.0",
"safe-buffer": "5.1.1",
"send": "0.16.2",
"serve-static": "1.13.2",
"setprototypeof": "1.1.0",
"statuses": "~1.4.0",
"type-is": "~1.6.16",
"utils-merge": "1.0.1",
"vary": "~1.1.2"
}
},
"finalhandler": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.1.tgz",
"integrity": "sha512-Y1GUDo39ez4aHAw7MysnUD5JzYX+WaIj8I57kO3aEPT1fFRL4sr7mjei97FgnwhAyyzRYmQZaTHb2+9uZ1dPtg==",
"requires": {
"debug": "2.6.9",
"encodeurl": "~1.0.2",
"escape-html": "~1.0.3",
"on-finished": "~2.3.0",
"parseurl": "~1.3.2",
"statuses": "~1.4.0",
"unpipe": "~1.0.0"
}
},
"forwarded": {
"version": "0.1.2",
"resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz",
"integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ="
},
"fresh": {
"version": "0.5.2",
"resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
"integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac="
},
"http-errors": {
"version": "1.6.3",
"resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
"integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=",
"requires": {
"depd": "~1.1.2",
"inherits": "2.0.3",
"setprototypeof": "1.1.0",
"statuses": ">= 1.4.0 < 2"
}
},
"iconv-lite": {
"version": "0.4.19",
"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.19.tgz",
"integrity": "sha512-oTZqweIP51xaGPI4uPa56/Pri/480R+mo7SeU+YETByQNhDG55ycFyNLIgta9vXhILrxXDmF7ZGhqZIcuN0gJQ=="
},
"inherits": {
"version": "2.0.3",
"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
"integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
},
"ipaddr.js": {
"version": "1.8.0",
"resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.8.0.tgz",
"integrity": "sha1-6qM9bd16zo9/b+DJygRA5wZzix4="
},
"media-typer": {
"version": "0.3.0",
"resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
"integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g="
},
"merge-descriptors": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
"integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E="
},
"methods": {
"version": "1.1.2",
"resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
"integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4="
},
"mime": {
"version": "1.4.1",
"resolved": "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz",
"integrity": "sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ=="
},
"mime-db": {
"version": "1.35.0",
"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.35.0.tgz",
"integrity": "sha512-JWT/IcCTsB0Io3AhWUMjRqucrHSPsSf2xKLaRldJVULioggvkJvggZ3VXNNSRkCddE6D+BUI4HEIZIA2OjwIvg=="
},
"mime-types": {
"version": "2.1.19",
"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.19.tgz",
"integrity": "sha512-P1tKYHVSZ6uFo26mtnve4HQFE3koh1UWVkp8YUC+ESBHe945xWSoXuHHiGarDqcEZ+whpCDnlNw5LON0kLo+sw==",
"requires": {
"mime-db": "~1.35.0"
}
},
"ms": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
},
"negotiator": {
"version": "0.6.1",
"resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.1.tgz",
"integrity": "sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk="
},
"on-finished": {
"version": "2.3.0",
"resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
"integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=",
"requires": {
"ee-first": "1.1.1"
}
},
"parseurl": {
"version": "1.3.2",
"resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.2.tgz",
"integrity": "sha1-/CidTtiZMRlGDBViUyYs3I3mW/M="
},
"path-to-regexp": {
"version": "0.1.7",
"resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
"integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w="
},
"proxy-addr": {
"version": "2.0.4",
"resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.4.tgz",
"integrity": "sha512-5erio2h9jp5CHGwcybmxmVqHmnCBZeewlfJ0pex+UW7Qny7OOZXTtH56TGNyBizkgiOwhJtMKrVzDTeKcySZwA==",
"requires": {
"forwarded": "~0.1.2",
"ipaddr.js": "1.8.0"
}
},
"qs": {
"version": "6.5.1",
"resolved": "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz",
"integrity": "sha512-eRzhrN1WSINYCDCbrz796z37LOe3m5tmW7RQf6oBntukAG1nmovJvhnwHHRMAfeoItc1m2Hk02WER2aQ/iqs+A=="
},
"range-parser": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.0.tgz",
"integrity": "sha1-9JvmtIeJTdxA3MlKMi9hEJLgDV4="
},
"raw-body": {
"version": "2.3.2",
"resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.3.2.tgz",
"integrity": "sha1-vNYMd9Prk83gBQKVw/N5OJvIj4k=",
"requires": {
"bytes": "3.0.0",
"http-errors": "1.6.2",
"iconv-lite": "0.4.19",
"unpipe": "1.0.0"
},
"dependencies": {
"depd": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/depd/-/depd-1.1.1.tgz",
"integrity": "sha1-V4O04cRZ8G+lyif5kfPQbnoxA1k="
},
"http-errors": {
"version": "1.6.2",
"resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.2.tgz",
"integrity": "sha1-CgAsyFcHGSp+eUbO7cERVfYOxzY=",
"requires": {
"depd": "1.1.1",
"inherits": "2.0.3",
"setprototypeof": "1.0.3",
"statuses": ">= 1.3.1 < 2"
}
},
"setprototypeof": {
"version": "1.0.3",
"resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.3.tgz",
"integrity": "sha1-ZlZ+NwQ+608E2RvWWMDL77VbjgQ="
}
}
},
"safe-buffer": {
"version": "5.1.1",
"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
"integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg=="
},
"send": {
"version": "0.16.2",
"resolved": "https://registry.npmjs.org/send/-/send-0.16.2.tgz",
"integrity": "sha512-E64YFPUssFHEFBvpbbjr44NCLtI1AohxQ8ZSiJjQLskAdKuriYEP6VyGEsRDH8ScozGpkaX1BGvhanqCwkcEZw==",
"requires": {
"debug": "2.6.9",
"depd": "~1.1.2",
"destroy": "~1.0.4",
"encodeurl": "~1.0.2",
"escape-html": "~1.0.3",
"etag": "~1.8.1",
"fresh": "0.5.2",
"http-errors": "~1.6.2",
"mime": "1.4.1",
"ms": "2.0.0",
"on-finished": "~2.3.0",
"range-parser": "~1.2.0",
"statuses": "~1.4.0"
}
},
"serve-static": {
"version": "1.13.2",
"resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.13.2.tgz",
"integrity": "sha512-p/tdJrO4U387R9oMjb1oj7qSMaMfmOyd4j9hOFoxZe2baQszgHcSWjuya/CiT5kgZZKRudHNOA0pYXOl8rQ5nw==",
"requires": {
"encodeurl": "~1.0.2",
"escape-html": "~1.0.3",
"parseurl": "~1.3.2",
"send": "0.16.2"
}
},
"setprototypeof": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
"integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ=="
},
"statuses": {
"version": "1.4.0",
"resolved": "https://registry.npmjs.org/statuses/-/statuses-1.4.0.tgz",
"integrity": "sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew=="
},
"type-is": {
"version": "1.6.16",
"resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.16.tgz",
"integrity": "sha512-HRkVv/5qY2G6I8iab9cI7v1bOIdhm94dVjQCPFElW9W+3GeDOSHmy2EBYe4VTApuzolPcmgFTN3ftVJRKR2J9Q==",
"requires": {
"media-typer": "0.3.0",
"mime-types": "~2.1.18"
}
},
"unpipe": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
"integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw="
},
"utils-merge": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
"integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM="
},
"vary": {
"version": "1.1.2",
"resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
"integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw="
}
}
}
+15
View File
@@ -0,0 +1,15 @@
{
"name": "express-app",
"version": "1.0.0",
"description": "",
"main": "index.js",
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
},
"keywords": [],
"author": "",
"license": "ISC",
"dependencies": {
"express": "^4.16.3"
}
}
+1
View File
@@ -0,0 +1 @@
<h1>Hello World!</h1>
+28 -41
View File
@@ -1,45 +1,32 @@
#!/usr/bin/env node #!/usr/bin/env node
const options = require('./lib/options')
/* eslint-disable no-undef */
/* eslint-disable @typescript-eslint/no-var-requires */
const eol = require('os').EOL
async function main() {
const util = require('./lib/cjs/util.js')
await util.initEsm()
const color = util.color,
options = require('./lib/cjs/options.js'),
nexe = require('./lib/cjs/nexe.js'),
NexeError = require('./lib/cjs/compiler.js').NexeError,
del = eol + eol,
argv = options.argv,
showHelp = argv.help || argv._.some((x) => x === 'help'),
showVersion = argv.version || argv._.some((x) => x === 'version')
try {
if (!(showHelp || showVersion)) {
await nexe.compile(argv)
} else {
process.stderr.write(showHelp ? options.help() : options.version + eol)
}
} catch (error) {
if (argv.loglevel !== 'silent') {
if (error instanceof NexeError) {
process.stderr.write(
`${eol}${color('red', 'Error: ')}${error.message}${del}See nexe -h for usage..${del}`
)
} else {
process.stderr.write(error.stack + eol)
}
}
process.exit(1)
}
process.exit(0)
}
if (require.main === module) { if (require.main === module) {
main() //fast path for help/version
const argv = options.argv
const eol = require('os').EOL
const showHelp = argv.help || argv._.some(x => x === 'help')
const showVersion = argv.version || argv._.some(x => x === 'version')
if (showHelp || showVersion) {
process.stderr.write(showHelp ? options.help : options.version + eol)
} else {
const nexe = require('./lib/nexe')
nexe.compile(argv).catch((error) => {
const NexeError = require('./lib/compiler').NexeError
const chalk = require('chalk')
const isSilent = Boolean(argv.silent === true || argv.loglevel === 'silent')
if (!isSilent) {
if (error instanceof NexeError) {
process.stderr.write(eol + chalk.red('Error: ') + error.message + eol
+ eol + 'See nexe -h for usage..' + eol + eol
)
} else {
process.stderr.write(error.stack + eol)
}
}
process.exit(1)
})
}
} else { } else {
process.stderr.write('Cannot require(..) the nexe cli') module.exports = require('./lib/nexe')
process.exit(1)
} }
+5856 -5012
View File
File diff suppressed because it is too large Load Diff
+71 -101
View File
@@ -2,123 +2,93 @@
"name": "nexe", "name": "nexe",
"description": "Create a single executable out of your Node.js application", "description": "Create a single executable out of your Node.js application",
"license": "MIT", "license": "MIT",
"type": "commonjs", "version": "5.0.0-beta.1",
"version": "4.0.0-rc.local", "contributors": [
"bin": { "Craig Condon <craig.j.condon@gmail.com> (http://crcn.io)",
"nexe": "./index.js" "Jared Allard <jaredallard@outlook.com>",
}, "Caleb Boyd <caleb.boyd@hotmail.com>"
"types": "./lib/types/nexe.d.ts", ],
"main": "./lib/cjs/nexe.js", "scripts": {
"exports": { "ci:build": "ts-node tasks/build",
"./package.json": "./package.json", "test": "mocha",
".": { "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",
"types": "./lib/types/nexe.d.ts", "test:integration:run": "run-script-os",
"node": { "test:integration:run:win32": "integration-tests.exe",
"import": "./lib/esm/nexe.js", "test:integration:run:default": "./integration-tests",
"require": "./lib/cjs/nexe.js" "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",
"engines": { "postbuild": "ts-node tasks/post-build"
"node": ">=14"
}, },
"repository": { "repository": {
"type": "git", "type": "git",
"url": "git://github.com/nexe/nexe.git" "url": "git://github.com/nexe/nexe.git"
}, },
"files": [ "files": [
"lib", "lib"
"index.js"
], ],
"scripts": { "typings": "lib/nexe.d.ts",
"lint": "tsc --noEmit && eslint \"{src,tasks,test}/**/*.ts\" --fix", "main": "index.js",
"test": "vitest run && node test/exports.mjs", "bin": {
"prepublishOnly": "npm run lint && npm run build && npm test", "nexe": "index.js"
"build": "npm run cjs:build & npm run esm:build", },
"prebuild": "rm -rf lib", "engines": {
"cjs:build": "swc src -d lib/cjs --copy-files", "node": ">=10"
"esm:build": "swc src -d lib/esm --copy-files -C module.type=es6", },
"postbuild": "node -p \"JSON.stringify({type:'module'})\" > lib/esm/package.json && tsc --emitDeclarationOnly && ts-node tasks/post-build" "mocha": {
"spec": "./test/**/*.spec.ts",
"checkLeaks": true,
"require": [
"ts-node/register"
]
}, },
"contributors": [
"Craig Condon <craig.j.condon@gmail.com> (http://crcn.io)",
"Jared Allard <jaredallard@outlook.com>",
"Caleb Boyd <caleb.boyd@hotmail.com>"
],
"dependencies": { "dependencies": {
"@yarnpkg/fslib": "^2.6.0-rc.8",
"@yarnpkg/libzip": "^2.2.2",
"app-builder": "^7.0.4",
"archiver": "^5.3.1",
"caw": "^2.0.1", "caw": "^2.0.1",
"chalk": "^5.2.0", "chalk": "^2.4.2",
"download": "^8.0.0", "download": "^8.0.0",
"fast-glob": "^3.2.12", "globby": "^11.0.2",
"got": "^12.5.3", "got": "^11.8.2",
"meriyah": "^4.3.3", "meriyah": "^4.3.3",
"minimist": "^1.2.7", "minimist": "^1.2.6",
"mkdirp": "^1.0.4",
"multistream": "^4.1.0", "multistream": "^4.1.0",
"ora": "^6.1.2", "ora": "^3.4.0",
"resolve-dependencies": "^6.0.8" "resolve-dependencies": "^6.0.8",
"rimraf": "^3.0.2",
"run-script-os": "^1.1.6",
"webpack-config-prefabs": "0.0.5"
}, },
"devDependencies": { "devDependencies": {
"@swc/cli": "^0.1.57", "@types/archiver": "^5.3.2",
"@swc/core": "^1.3.24", "@types/chai": "^4",
"@types/download": "^6",
"@types/globby": "^9",
"@types/got": "^9.6.12",
"@types/highland": "^2.12.14",
"@types/lodash": "^4.14.173",
"@types/minimist": "^1.2.2", "@types/minimist": "^1.2.2",
"@types/mkdirp": "^1.0.2",
"@types/mocha": "^9.0.0",
"@types/multistream": "^4.1.0", "@types/multistream": "^4.1.0",
"@typescript-eslint/eslint-plugin": "^5.47.0", "@types/node": "^16.10.2",
"@typescript-eslint/parser": "^5.47.0", "@types/ora": "^3.2.0",
"eslint": "^8.30.0", "@types/rimraf": "3.0.2",
"eslint-config-prettier": "~8.5.0", "@types/semver": "^7.3.8",
"eslint-plugin-import": "^2.26.0", "chai": "^4.3.6",
"eslint-plugin-prettier": "^4.2.1", "execa": "^5.1.1",
"prettier": "^2.8.1", "lodash": "^4.17.21",
"ts-node": "^10.9.1", "mocha": "^10.0.0",
"typescript": "^4.9.4", "prettier": "^2.6.2",
"vitest": "^0.26.2" "ts-node": "^10.7.0",
}, "tslint": "^6.1.1",
"prettier": { "tslint-config-prettier": "^1.18.0",
"parser": "typescript", "tslint-plugin-prettier": "^2.3.0",
"semi": false, "typescript": "^4.6.4",
"singleQuote": true, "webpack-cli": "^4.8.0"
"printWidth": 100
},
"eslintConfig": {
"parser": "@typescript-eslint/parser",
"plugins": [
"import",
"@typescript-eslint"
],
"extends": [
"eslint:recommended",
"plugin:@typescript-eslint/recommended",
"prettier",
"plugin:prettier/recommended"
],
"rules": {
"@typescript-eslint/consistent-type-imports": [
2,
{
"prefer": "type-imports",
"disallowTypeAnnotations": false
}
],
"import/extensions": [
2,
"ignorePackages"
],
"@typescript-eslint/no-unused-vars": [
2,
{
"args": "after-used",
"ignoreRestSiblings": true,
"argsIgnorePattern": "^_"
}
],
"@typescript-eslint/no-use-before-define": 0,
"@typescript-eslint/no-explicit-any": 0,
"@typescript-eslint/explicit-function-return-type": 0,
"no-warning-comments": 1,
"one-var": [
"error",
"consecutive"
]
}
} }
} }
+116 -80
View File
@@ -1,22 +1,30 @@
import { resolve, normalize, join } from 'node:path' import { delimiter, resolve, normalize, join } from 'path'
import { Buffer } from 'node:buffer' import { Buffer } from 'buffer'
import type { ReadStream } from 'node:fs' import { createReadStream, ReadStream } from 'fs'
import { createReadStream } from 'node:fs' import { spawn } from 'child_process'
import { spawn } from 'node:child_process' import { Logger, LogStep } from './logger'
import {
readFileAsync,
writeFileAsync,
pathExistsAsync,
statAsync,
dequote,
isWindows,
bound,
semverGt,
wrap,
} from './util'
import { NexeOptions, version } from './options'
import { NexeTarget } from './target'
import { PassThrough, Readable, Stream, Transform } from 'stream'
import MultiStream = require('multistream')
import { Bundle, toStream } from './fs/bundle'
import { File } from 'resolve-dependencies'
import { FactoryStream, LazyStream } from 'multistream'
import type { File } from 'resolve-dependencies' const isBsd = Boolean(~process.platform.indexOf('bsd'))
import MultiStream from 'multistream' const make = isWindows ? 'vcbuild.bat' : isBsd ? 'gmake' : 'make'
const configure = isWindows ? 'configure' : './configure'
import type { LogStep } from './logger.js'
import { Logger } from './logger.js'
import { readFile, writeFile, pathExists, isWindows, bound, wrap } from './util.js'
import { version } from './options.js'
import type { NexeOptions } from './options.js'
import type { NexeTarget } from './target.js'
import { Bundle, toStream } from './fs/bundle.js'
const isBsd = Boolean(~process.platform.indexOf('bsd')),
make = isWindows ? 'vcbuild.bat' : isBsd ? 'gmake' : 'make'
type StringReplacer = (match: string) => string type StringReplacer = (match: string) => string
@@ -39,7 +47,7 @@ export class NexeCompiler {
/** /**
* Epoch of when compilation started * Epoch of when compilation started
*/ */
private readonly start = Date.now() private start = Date.now()
private compileStep: LogStep | undefined private compileStep: LogStep | undefined
public log = new Logger(this.options.loglevel) public log = new Logger(this.options.loglevel)
/** /**
@@ -65,7 +73,7 @@ export class NexeCompiler {
/** /**
* The last shim (defaults to "require('module').runMain()") * The last shim (defaults to "require('module').runMain()")
*/ */
public startup = '' public startup: string = ''
/** /**
* The main entrypoint filename for your application - eg. node mainFile.js * The main entrypoint filename for your application - eg. node mainFile.js
*/ */
@@ -86,6 +94,10 @@ export class NexeCompiler {
* Flag to indicate whether or notstdin was used for input * Flag to indicate whether or notstdin was used for input
*/ */
public stdinUsed = false public stdinUsed = false
/**
* Path to the configure script
*/
public configureScript: string
/** /**
* The file path of node binary * The file path of node binary
*/ */
@@ -97,29 +109,37 @@ export class NexeCompiler {
constructor(public options: NexeOptions) { constructor(public options: NexeOptions) {
const { python } = (this.options = options) const { python } = (this.options = options)
// SOMEDAY iterate over multiple targets with `--outDir` //SOMEDAY iterate over multiple targets with `--outDir`
this.targets = options.targets as NexeTarget[] this.targets = options.targets as NexeTarget[]
this.target = this.targets[0] this.target = this.targets[0]
if (!/https?:\/\//.test(options.remote)) { if (!/https?\:\/\//.test(options.remote)) {
throw new NexeError(`Invalid remote URI scheme (must be http or https): ${options.remote}`) throw new NexeError(`Invalid remote URI scheme (must be http or https): ${options.remote}`)
} }
this.remoteAsset = options.remote + this.target.toString() this.remoteAsset = options.remote + this.target.toString()
this.src = join(this.options.temp, this.target.version) this.src = join(this.options.temp, this.target.version)
this.configureScript = configure + (semverGt(this.target.version, '10.10.0') ? '.py' : '')
this.nodeSrcBinPath = isWindows this.nodeSrcBinPath = isWindows
? join(this.src, 'Release', 'node.exe') ? join(this.src, 'Release', 'node.exe')
: join(this.src, 'out', 'Release', 'node') : join(this.src, 'out', 'Release', 'node')
this.log.step('nexe ' + version, 'info') this.log.step('nexe ' + version, 'info')
this.bundle = new Bundle(options) this.bundle = new Bundle(options)
if (isWindows) {
this.env = { ...process.env } const originalPath = process.env.PATH
if (python) { delete process.env.PATH
this.env.PYTHON = python this.env = { ...process.env }
this.env.PATH = python
? (this.env.PATH = dequote(normalize(python)) + delimiter + originalPath)
: originalPath
process.env.PATH = originalPath
} else {
this.env = { ...process.env }
python && (this.env.PYTHON = python)
} }
} }
@bound @bound
async addResource(absoluteFileName: string, content?: Buffer | string | File) { addResource(absoluteFileName: string, content?: Buffer | string | File) {
return await this.bundle.addResource(absoluteFileName, content) return this.bundle.addResource(absoluteFileName, content)
} }
@bound @bound
@@ -131,7 +151,7 @@ export class NexeCompiler {
cachedFile = { cachedFile = {
absPath, absPath,
filename: file, filename: file,
contents: await readFile(absPath, 'utf-8').catch((x) => { contents: await readFileAsync(absPath, 'utf-8').catch((x) => {
if (x.code === 'ENOENT') return '' if (x.code === 'ENOENT') return ''
throw x throw x
}), }),
@@ -142,26 +162,15 @@ export class NexeCompiler {
} }
@bound @bound
async writeFileAsync(file: string, contents: string | Buffer) { writeFileAsync(file: string, contents: string | Buffer) {
this.assertBuild() this.assertBuild()
return await writeFile(join(this.src, file), contents) return writeFileAsync(join(this.src, file), contents)
} }
@bound @bound
async replaceInFileAsync( async replaceInFileAsync(file: string, replace: string | RegExp, value: string | StringReplacer) {
file: string,
replace: string | RegExp,
value: string | StringReplacer
): Promise<boolean> {
const entry = await this.readFileAsync(file) const entry = await this.readFileAsync(file)
let replaced = false entry.contents = entry.contents.toString().replace(replace, value as any)
const replacer = (match: string) => {
replaced = true
if (typeof value === 'function') return value(match)
return value
}
entry.contents = entry.contents.toString().replace(replace, replacer)
return replaced
} }
@bound @bound
@@ -170,10 +179,10 @@ export class NexeCompiler {
entry.contents = contents entry.contents = contents
} }
async quit(error?: any) { quit(error?: any) {
const time = Date.now() - this.start const time = Date.now() - this.start
this.log.write(`Finished in ${time / 1000}s`, error ? 'red' : 'green') this.log.write(`Finished in ${time / 1000}s`, error ? 'red' : 'green')
return await this.log.flush() return this.log.flush()
} }
assertBuild() { assertBuild() {
@@ -192,11 +201,11 @@ export class NexeCompiler {
return this.nodeSrcBinPath return this.nodeSrcBinPath
} }
private async _runBuildCommandAsync(command: string, args: string[]) { private _runBuildCommandAsync(command: string, args: string[]) {
if (this.log.verbose) { if (this.log.verbose) {
this.compileStep?.pause() this.compileStep!.pause()
} }
return await new Promise<void>((resolve, reject) => { return new Promise<void>((resolve, reject) => {
spawn(command, args, { spawn(command, args, {
cwd: this.src, cwd: this.src,
env: this.env, env: this.env,
@@ -204,13 +213,13 @@ export class NexeCompiler {
}) })
.once('error', (e: Error) => { .once('error', (e: Error) => {
if (this.log.verbose) { if (this.log.verbose) {
this.compileStep?.resume() this.compileStep!.resume()
} }
reject(e) reject(e)
}) })
.once('close', (code: number) => { .once('close', (code: number) => {
if (this.log.verbose) { if (this.log.verbose) {
this.compileStep?.resume() this.compileStep!.resume()
} }
if (code != 0) { if (code != 0) {
const error = `${command} ${args.join(' ')} exited with code: ${code}` const error = `${command} ${args.join(' ')} exited with code: ${code}`
@@ -221,66 +230,93 @@ export class NexeCompiler {
}) })
} }
private async _configureAsync() { private _configureAsync() {
if (isWindows) { if (isWindows && semverGt(this.target.version, '10.15.99')) {
return await Promise.resolve() return Promise.resolve()
} }
return await this._runBuildCommandAsync(this.env.PYTHON || 'python3', [ return this._runBuildCommandAsync(this.env.PYTHON || 'python', [
'./configure.py', this.configureScript,
...this.options.configure, ...this.options.configure,
]) ])
} }
public async build(): Promise<ReadStream> { public async build(): Promise<ReadStream> {
this.compileStep?.log( this.compileStep!.log(
`Configuring node build${ `Configuring node build${
this.options.configure.length > 0 ? ': ' + this.options.configure : '...' this.options.configure.length ? ': ' + this.options.configure : '...'
}` }`
) )
await this._configureAsync() await this._configureAsync()
const buildOptions = this.options.make const buildOptions = this.options.make
this.compileStep?.log( this.compileStep!.log(
`Compiling Node${buildOptions.length > 0 ? ' with arguments: ' + buildOptions : '...'}` `Compiling Node${buildOptions.length ? ' with arguments: ' + buildOptions : '...'}`
) )
await this._runBuildCommandAsync(make, buildOptions) await this._runBuildCommandAsync(make, buildOptions)
return createReadStream(this.getNodeExecutableLocation()) return createReadStream(this.getNodeExecutableLocation())
} }
async compileAsync(target: NexeTarget) { private async _shouldCompileBinaryAsync(binary: NodeJS.ReadableStream | null, location: string) {
const step = (this.compileStep = this.log.step('Compiling result')), //SOMEDAY combine make/configure/vcBuild/and modified times of included files
build = this.options.build, const { snapshot, build } = this.options
location = this.getNodeExecutableLocation(build ? undefined : target)
let binary = (await pathExists(location)) ? createReadStream(location) : null
if (!binary) { if (!binary) {
return true
}
if (build && snapshot != null && (await pathExistsAsync(snapshot))) {
const snapshotLastModified = (await statAsync(snapshot)).mtimeMs
const binaryLastModified = (await statAsync(location)).mtimeMs
return snapshotLastModified > binaryLastModified
}
return false
}
async compileAsync(target: NexeTarget) {
const step = (this.compileStep = this.log.step('Compiling result'))
const build = this.options.build
const location = this.getNodeExecutableLocation(build ? undefined : target)
let binary = (await pathExistsAsync(location)) ? createReadStream(location) : null
if (await this._shouldCompileBinaryAsync(binary, location)) {
binary = await this.build() binary = await this.build()
step.log('Node binary compiled') step.log('Node binary compiled')
} }
return await this._assembleDeliverable(binary) return this._assembleDeliverable(binary!)
} }
code() { code() {
return [this.shims.join(''), this.startup].join(';') return [this.shims.join(''), this.startup].join(';')
} }
private async _assembleDeliverable(binary: NodeJS.ReadableStream) { private async _assembleDeliverable(binary: Readable) {
if (!this.options.mangle) { if (!this.options.mangle) {
return binary return binary
} }
const resources = this.bundle.renderIndex() const launchCode = this.code()
this.shims.unshift(wrap(`process.__nexe = ${JSON.stringify({ resources })};\n`)) const codeSize = Buffer.byteLength(launchCode)
const sentinel = Buffer.from('<nexe~~sentinel>')
const code = this.code(), let vfsSize = 0
codeSize = Buffer.byteLength(code), const streams = [binary, toStream(launchCode), this.bundle.toStream().pipe(new Transform({
lengths = Buffer.from(Array(16)) transform: (chunk, _, cb) => {
vfsSize || this.bundle.finalize()
chunk && (vfsSize += chunk.length)
cb(null, chunk)
},
}))]
lengths.writeDoubleLE(codeSize, 0) let done = false
lengths.writeDoubleLE(this.bundle.size, 8) return new MultiStream((cb) => {
return new (MultiStream as any)([ if (done) cb(null, null)
binary, else if (streams.length) cb(null, streams.shift() as Readable)
toStream(code), else {
this.bundle.toStream(), done = true
toStream(Buffer.concat([Buffer.from('<nexe~~sentinel>'), lengths])), const trailers = Buffer.alloc(16)
]) trailers.writeDoubleLE(codeSize, 0)
trailers.writeDoubleLE(vfsSize, 8)
cb(null, toStream(Buffer.concat([sentinel, trailers])))
}
})
} }
} }
+383
View File
@@ -0,0 +1,383 @@
import { Libzip } from '@yarnpkg/libzip'
import {
FakeFS,
PortablePath,
ZipFS,
ZipOpenFS,
RmdirOptions,
OpendirOptions,
} from '@yarnpkg/fslib'
import { BasePortableFakeFS, Dirent, MkdirOptions, Dir } from '@yarnpkg/fslib/lib/FakeFS'
import { CustomDir } from '@yarnpkg/fslib/lib/algorithms/opendir'
import { FSPath, ppath, npath, Filename } from '@yarnpkg/fslib/lib/path'
import { resolve, toNamespacedPath } from 'path'
import { constants } from 'fs'
export type SnapshotZipFSOptions = {
baseFs: FakeFS<PortablePath>
libzip: Libzip | (() => Libzip)
zipFs: ZipFS
}
const uniqBy = (arr: Array<string | Dirent>, pick: (...arg: any[]) => any) => {
return arr.filter((x, i, self) => i === self.findIndex((y) => pick(x) === pick(y)))
}
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>
constructor(opts: SnapshotZipFSOptions) {
super()
this.zipFs = opts.zipFs
this.baseFs = opts.baseFs
}
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.makeCallPromise(
p,
async () => {
return await this.baseFs.realpathPromise(p)
},
async (zipFs, { subPath }) => {
return await zipFs.realpathPromise(subPath)
}
)
}
realpathSync(p: PortablePath) {
return this.makeCallSync(
p,
() => {
return this.baseFs.realpathSync(p)
},
(zipFs, { subPath }) => {
return zipFs.realpathSync(subPath)
}
)
}
findZip(p: PortablePath) {
p = this.resolve(p)
const pathsToTry = Array.from(
new Set([
p,
resolve('/snapshot', p),
ppath.resolve(
npath.toPortablePath('/snapshot'),
npath.toPortablePath(
npath.relative(npath.fromPortablePath(process.cwd()), npath.fromPortablePath(p))
)
),
ppath.resolve(
npath.toPortablePath('/snapshot'),
npath.toPortablePath(
npath.relative(
toNamespacedPath(npath.fromPortablePath(process.cwd())),
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 as any[]).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 as any[]).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 Promise.resolve(this.zipFs.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
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
}
+13 -14
View File
@@ -1,21 +1,20 @@
if (true) { if (true) {
const patches = (process.nexe = { patches: {} }).patches const __nexe_patches = (process.nexe = { patches: {} }).patches
const slice = [].slice
;["ReadFile", "ReadJSON", "Stat"].forEach((x) => { const __nexe_noop_patch = function (original) {
patch(process.binding("fs"), "internalModule" + x, noop) const args = slice.call(arguments, 1)
})
function noop(original, ...args) {
return original.apply(this, args) return original.apply(this, args)
} }
const __nexe_patch = function (obj, method, patch) {
function patch(obj, method, patch) { const original = obj[method]
const original = obj[method];
if (!original) return if (!original) return
patches[method] = patch __nexe_patches[method] = patch
obj[method] = function (...args) { obj[method] = function() {
args.unshift(original) const args = [original].concat(slice.call(arguments))
return patches[method].apply(this, args) return __nexe_patches[method].apply(this, args)
} }
} }
__nexe_patch((process).binding('fs'), 'internalModuleReadFile', __nexe_noop_patch)
__nexe_patch((process).binding('fs'), 'internalModuleReadJSON', __nexe_noop_patch)
__nexe_patch((process).binding('fs'), 'internalModuleStat', __nexe_noop_patch)
} }
+23 -126
View File
@@ -1,19 +1,10 @@
import { lstat, realpath, stat } from 'node:fs/promises' import { relative } from 'path'
import { createReadStream } from 'node:fs' import { Readable } from 'stream'
import { relative } from 'node:path' import { File } from 'resolve-dependencies'
import { Readable } from 'node:stream' import archiver from 'archiver'
import type { File } from 'resolve-dependencies' function makeRelativeToZip(cwd: string, path: string) {
import MultiStream from 'multistream' return '/snapshot/' + relative(cwd, path)
export type MultiStreams = Array<Readable | (() => Readable)>
function makeRelative(cwd: string, path: string) {
return './' + relative(cwd, path)
}
function sortEntry(a: [string, File], b: [string, File]) {
return a[0] > b[0] ? 1 : -1
} }
export function toStream(content: Buffer | string) { export function toStream(content: Buffer | string) {
@@ -25,130 +16,36 @@ export function toStream(content: Buffer | string) {
}) })
return readable return readable
} }
async function createFile(absoluteFileName: string) {
const stats = await lstat(absoluteFileName),
file: File = {
size: stats.size,
moduleType: 'commonjs',
contents: '',
absPath: absoluteFileName,
deps: {},
}
if (stats.isSymbolicLink()) {
file.size = stats.size
const [realPath, realStat] = await Promise.all([
realpath(absoluteFileName),
stat(absoluteFileName),
])
file.realPath = realPath
file.realSize = realStat.size
}
return file
}
export class Bundle { export class Bundle {
size = 0
cwd: string cwd: string
rendered = false files = new Set<string>()
private offset = 0 zip: any
private index: { [key: string]: [number, number] } = {}
private files: { [key: string]: File } = {}
streams: MultiStreams = []
constructor({ cwd }: { cwd: string } = { cwd: process.cwd() }) { constructor({ cwd }: { cwd: string } = { cwd: process.cwd() }) {
this.cwd = cwd this.cwd = cwd
this.zip = archiver('zip')
} }
get list() { get list() {
return Object.keys(this.files) return Array.from(this.files)
} }
public async addResource( public addResource(absoluteFileName: string, content?: File | Buffer | string) {
absoluteFileName: string, const destPath = makeRelativeToZip(this.cwd, absoluteFileName)
content?: File | Buffer | string if (!this.files.has(destPath)) {
): Promise<number> { if (content == null) {
if (this.files[absoluteFileName]) { this.zip.file(absoluteFileName, { name: destPath })
return this.size
}
if (typeof content === 'string' || Buffer.isBuffer(content)) {
this.files[absoluteFileName] = {
size: Buffer.byteLength(content),
moduleType: 'commonjs',
contents: content.toString(),
deps: {},
absPath: absoluteFileName,
}
} else if (content) {
this.files[content.absPath] = content
} else {
this.files[absoluteFileName] = {
absPath: absoluteFileName,
moduleType: 'commonjs',
contents: '',
deps: {},
size: 0,
}
this.files[absoluteFileName] = await createFile(absoluteFileName)
}
return (this.size += this.files[absoluteFileName].size)
}
/**
* De-dupe files by absolute path, partition by symlink/real
* Iterate over real, add entries
* Iterate over symlinks, add symlinks
*/
renderIndex() {
if (this.rendered) {
throw new Error('Bundle index already rendered')
}
const files = Object.entries(this.files),
realFiles: Array<[string, File]> = [],
symLinks: Array<[string, File]> = []
for (const entry of files) {
if (entry[1].realPath) {
symLinks.push(entry)
} else { } else {
realFiles.push(entry) this.zip.append(content, { name: destPath })
} }
} this.files.add(destPath)
realFiles.sort(sortEntry)
symLinks.sort(sortEntry)
for (const [absPath, file] of realFiles) {
this.addEntry(absPath, file)
}
for (const [absPath, file] of symLinks) {
this.addEntry(file.realPath as string, file)
this.addEntry(absPath, file, file.realPath)
}
this.rendered = true
return this.index
}
/**
* Add a stream if needed and an entry with the required offset and size
* Ensure the calling order of this method is idempotent (eg, while iterating a sorted set)
* @param entryPath
* @param file
* @param useEntry
*/
addEntry(entryPath: string, file: File, useEntry?: string) {
const existingName = useEntry && makeRelative(this.cwd, useEntry),
name = makeRelative(this.cwd, entryPath),
size = file.realSize ?? file.size,
existingEntry = this.index[existingName ?? name]
this.index[name] = existingEntry || [this.offset, size]
if (!existingEntry) {
this.streams.push(() =>
file.contents ? toStream(file.contents) : createReadStream(file.absPath)
)
this.offset += size
} }
} }
toStream() { public finalize() {
return new MultiStream(this.streams) return this.zip.finalize()
}
public toStream(): Readable {
return this.zip
} }
} }
+15
View File
@@ -0,0 +1,15 @@
{
"name": "nexe-fs",
"version": "1.0.1",
"description": "Virtual File System used by nexe",
"main": "bundle.js",
"files": [
"*.d.ts",
"*.js"
],
"author": "Caleb Boyd",
"dependencies": {
"multistream": "^2.1.1"
},
"license": "MIT"
}
+61 -393
View File
@@ -1,433 +1,101 @@
/* eslint-disable prefer-rest-params */ import { getLibzipSync } from '@yarnpkg/libzip'
/* eslint-disable @typescript-eslint/no-var-requires */ import { patchFs, npath, PosixFS, NodeFS, ZipFS } from '@yarnpkg/fslib'
import type { Stats } from 'fs' import { SnapshotZipFS } from './SnapshotZipFS'
import type { Func } from '../util' import * as assert from 'assert'
import * as constants from 'constants'
export interface NexeBinary { export interface NexeHeader {
blobPath: string blobPath: string
resources: { [key: string]: number[] }
layout: { layout: {
stat: Stats
resourceStart: number resourceStart: number
contentSize?: number resourceSize: number
contentStart?: number contentSize: number
resourceSize?: number contentStart: number
} }
} }
let originalFsMethods: any = null, let originalFsMethods: any = null
lazyRestoreFs = () => void 0 let lazyRestoreFs = () => {}
const patches = (process as any).nexe.patches || {}
delete (process as any).nexe
// optional Win32 file namespace prefix followed by drive letter and colon function shimFs(binary: NexeHeader, fs: typeof import('fs') = require('fs')) {
const windowsFullPathRegex = /^(\\{2}\?\\)?([a-zA-Z]):/,
upcaseDriveLetter = (s: string): string =>
s.replace(windowsFullPathRegex, (_match, ns, drive) => `${ns || ''}${drive.toUpperCase()}:`)
function shimFs(binary: NexeBinary, fs: any = require('fs')) {
if (originalFsMethods !== null) { if (originalFsMethods !== null) {
return return
} }
originalFsMethods = Object.assign({}, fs)
const { blobPath, resources: manifest } = binary,
{ resourceStart, stat } = binary.layout,
directories: { [key: string]: { [key: string]: boolean } } = {},
notAFile = '!@#$%^&*',
isWin = process.platform.startsWith('win'),
isString = (x: any): x is string => typeof x === 'string' || x instanceof String,
noop = () => void 0
const path = require('path')
const winPath: (key: string) => string = isWin ? upcaseDriveLetter : (s) => s,
baseDir = winPath(path.dirname(process.execPath))
let log = (_: string) => true, originalFsMethods = Object.assign({}, fs)
loggedManifest = false
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, {
libzip: getLibzipSync(),
readOnly: true,
})
const snapshotZipFS = new SnapshotZipFS({
libzip: getLibzipSync(),
zipFs,
baseFs: nodeFs,
})
const posixSnapshotZipFs = new PosixFS(snapshotZipFS)
patchFs(fs, posixSnapshotZipFs)
const { readFileSync } = fs
let log = (_: string) => true
let loggedManifest = false
if ((process.env.DEBUG || '').toLowerCase().includes('nexe:require')) { if ((process.env.DEBUG || '').toLowerCase().includes('nexe:require')) {
log = (text: string) => { log = (text: string) => {
setupManifest()
if (!loggedManifest) { if (!loggedManifest) {
process.stderr.write('[nexe] - MANIFEST' + JSON.stringify(manifest, null, 4) + '\n') // TODO anything meaningful to log here?
process.stderr.write('[nexe] - DIRECTORIES' + JSON.stringify(directories, null, 4) + '\n')
loggedManifest = true loggedManifest = true
} }
return process.stderr.write('[nexe] - ' + text + '\n') return process.stderr.write('[nexe] - ' + text + '\n')
} }
} }
const getKey = function getKey(filepath: string | Buffer | null): string {
if (Buffer.isBuffer(filepath)) {
filepath = filepath.toString()
}
if (!isString(filepath)) {
return notAFile
}
const key = path.resolve(baseDir, filepath)
return winPath(key)
},
statTime = function () {
return {
atime: new Date(stat.atime),
mtime: new Date(stat.mtime),
ctime: new Date(stat.ctime),
birthtime: new Date(stat.birthtime),
}
}
let BigInt: any
try {
BigInt = eval('BigInt')
} catch (ignored) {
void ignored
}
const minBlocks = Math.max(Math.ceil(stat.blksize / 512), 1),
createStat = function (extensions: any, options: any) {
const stat = Object.assign(new fs.Stats(), binary.layout.stat, statTime(), extensions)
if ('size' in extensions) {
// Assume non adjustable allocation size for file system
stat.blocks = Math.ceil(stat.size / stat.blksize) * minBlocks
}
if (options && options.bigint && typeof BigInt !== 'undefined') {
for (const k in stat) {
if (Object.prototype.hasOwnProperty.call(stat, k) && typeof stat[k] === 'number') {
stat[k] = BigInt(stat[k])
}
}
}
return stat
},
ownStat = function (filepath: any, options: any) {
setupManifest()
const key = getKey(filepath)
if (directories[key]) {
let mode = binary.layout.stat.mode
mode |= fs.constants.S_IFDIR
mode &= ~fs.constants.S_IFREG
return createStat({ mode, size: 0 }, options)
}
if (manifest[key]) {
return createStat({ size: manifest[key][1] }, options)
}
},
getStat = function (fn: string) {
return function stat(filepath: string | Buffer, options: any, callback: any) {
let stat: any
if (typeof options === 'function') {
callback = options
stat = ownStat(filepath, null)
} else {
stat = ownStat(filepath, options)
}
if (stat) {
process.nextTick(() => {
callback(null, stat)
})
} else {
return originalFsMethods[fn].apply(fs, arguments)
}
}
}
function makeLong(filepath: string) {
return path._makeLong && path._makeLong(filepath)
}
function fileOpts(options: any) {
return !options ? {} : isString(options) ? { encoding: options } : options
}
let setupManifest = () => {
Object.keys(manifest).forEach((filepath) => {
const entry = manifest[filepath],
absolutePath = getKey(filepath),
longPath = makeLong(absolutePath),
normalizedPath = winPath(path.normalize(filepath))
if (!manifest[absolutePath]) {
manifest[absolutePath] = entry
}
if (longPath && !manifest[longPath]) {
manifest[longPath] = entry
}
if (!manifest[normalizedPath]) {
manifest[normalizedPath] = manifest[filepath]
}
let currentDir = path.dirname(absolutePath),
prevDir = absolutePath
while (currentDir !== prevDir) {
directories[currentDir] = directories[currentDir] || {}
directories[currentDir][path.basename(prevDir)] = true
const longDir = makeLong(currentDir)
if (longDir && !directories[longDir]) {
directories[longDir] = directories[currentDir]
}
prevDir = currentDir
currentDir = path.dirname(currentDir)
}
})
;(manifest[notAFile] as any) = false
;(directories[notAFile] as any) = false
setupManifest = noop
}
// naive patches intended to work for most use cases
const nfs: any = {
existsSync: function existsSync(filepath: string) {
setupManifest()
const key = getKey(filepath)
if (manifest[key] || directories[key]) {
return true
}
return originalFsMethods.existsSync.apply(fs, arguments)
},
realpath: function realpath(filepath: any, options: any, cb: any): void {
setupManifest()
const key = getKey(filepath)
if (isString(filepath) && (manifest[filepath] || manifest[key])) {
return process.nextTick(() => cb(null, filepath))
}
return originalFsMethods.realpath.call(fs, filepath, options, cb)
},
realpathSync: function realpathSync(filepath: any, options: any) {
setupManifest()
const key = getKey(filepath)
if (manifest[key]) {
return filepath
}
return originalFsMethods.realpathSync.call(fs, filepath, options)
},
readdir: function readdir(filepath: string | Buffer, options: any, callback: any) {
setupManifest()
const dir = directories[getKey(filepath)]
if (dir) {
if (typeof options === 'function') {
callback = options
options = { encoding: 'utf8' }
}
process.nextTick(() => callback(null, Object.keys(dir)))
} else {
return originalFsMethods.readdir.apply(fs, arguments)
}
},
readdirSync: function readdirSync(filepath: string | Buffer) {
setupManifest()
const dir = directories[getKey(filepath)]
if (dir) {
return Object.keys(dir)
}
return originalFsMethods.readdirSync.apply(fs, arguments)
},
readFile: function readFile(filepath: any, options: any, callback: any) {
setupManifest()
const entry = manifest[getKey(filepath)]
if (!entry) {
return originalFsMethods.readFile.apply(fs, arguments)
}
const [offset, length] = entry,
resourceOffset = resourceStart + offset,
encoding = fileOpts(options).encoding
callback = typeof options === 'function' ? options : callback
originalFsMethods.open(blobPath, 'r', function (err: Error, fd: number) {
if (err) return callback(err, null)
originalFsMethods.read(
fd,
Buffer.alloc(length),
0,
length,
resourceOffset,
function (error: Error, bytesRead: number, result: Buffer) {
if (error) {
return originalFsMethods.close(fd, function () {
callback(error, null)
})
}
originalFsMethods.close(fd, function (err: Error) {
if (err) {
return callback(err, result)
}
callback(err, encoding ? result.toString(encoding) : result)
})
}
)
})
},
createReadStream: function createReadStream(filepath: any, options: any) {
setupManifest()
const entry = manifest[getKey(filepath)]
if (!entry) {
return originalFsMethods.createReadStream.apply(fs, arguments)
}
const [offset, length] = entry,
resourceOffset = resourceStart + offset,
opts = fileOpts(options)
return originalFsMethods.createReadStream(
blobPath,
Object.assign({}, opts, {
start: resourceOffset,
end: resourceOffset + length - 1,
})
)
},
readFileSync: function readFileSync(filepath: any, options: any) {
setupManifest()
const entry = manifest[getKey(filepath)]
if (!entry) {
return originalFsMethods.readFileSync.apply(fs, arguments)
}
const [offset, length] = entry,
resourceOffset = resourceStart + offset,
encoding = fileOpts(options).encoding,
fd = originalFsMethods.openSync(process.execPath, 'r'),
result = Buffer.alloc(length)
originalFsMethods.readSync(fd, result, 0, length, resourceOffset)
originalFsMethods.closeSync(fd)
return encoding ? result.toString(encoding) : result
},
statSync: function statSync(filepath: string | Buffer, options: any) {
const stat = ownStat(filepath, options)
if (stat) {
return stat
}
return originalFsMethods.statSync.apply(fs, arguments)
},
stat: getStat('stat'),
lstat: getStat('lstat'),
lstatSync: function statSync(filepath: string | Buffer, options: any) {
const stat = ownStat(filepath, options)
if (stat) {
return stat
}
return originalFsMethods.lstatSync.apply(fs, arguments)
},
}
if (typeof fs.exists === 'function') {
nfs.exists = function (filepath: string, cb: Func) {
cb = cb || noop
const exists = nfs.existsSync(filepath)
process.nextTick(() => cb(exists))
}
}
const patches = (process as any).nexe.patches || {}
delete (process as any).nexe
patches.internalModuleReadFile = function (this: any, original: any, ...args: any[]) { patches.internalModuleReadFile = function (this: any, original: any, ...args: any[]) {
setupManifest() log(`internalModuleReadFile ${args[0]}`)
const filepath = getKey(args[0]) try {
if (manifest[filepath]) { return fs.readFileSync(args[0], 'utf-8')
log('read (hit) ' + filepath) } catch (e) {
return nfs.readFileSync(filepath, 'utf-8') return null
} }
log('read (miss) ' + filepath)
return original.call(this, ...args)
} }
let returningArray: boolean let returningArray: boolean
patches.internalModuleReadJSON = function (this: any, original: any, ...args: any[]) { patches.internalModuleReadJSON = function (this: any, original: any, ...args: any[]) {
if (!returningArray) returningArray = Array.isArray(original.call(this, '')) if (returningArray == null) returningArray = Array.isArray(original.call(this, ''))
const res = patches.internalModuleReadFile.call(this, original, ...args) const res = patches.internalModuleReadFile.call(this, original, ...args)
return returningArray && !Array.isArray(res) return returningArray && !Array.isArray(res)
? [res, /"(main|name|type|exports|imports)"/.test(res)] ? [res, /"(main|name|type|exports|imports)"/.test(res)]
: res : res
} }
patches.internalModuleStat = function (this: any, original: any, ...args: any[]) { patches.internalModuleStat = function (this: any, original: any, ...args: any[]) {
setupManifest() log(`internalModuleStat ${args[0]}`)
const filepath = getKey(args[0]) try {
if (manifest[filepath]) { const stat = fs.statSync(args[0])
log('stat (hit) ' + filepath + ' ' + 0) if (stat.isDirectory()) return 1
return 0 return 0
} } catch (e) {
if (directories[filepath]) { return -constants.ENOENT
log('stat dir (hit) ' + filepath + ' ' + 1)
return 1
}
const res = original.call(this, ...args)
if (res === 0) {
log('stat (miss) ' + filepath + ' ' + res)
} else if (res === 1) {
log('stat dir (miss) ' + filepath + ' ' + res)
} else {
log('stat (fail) ' + filepath + ' ' + res)
}
return res
}
if (typeof fs.exists === 'function') {
nfs.exists = function (filepath: string, cb: Func) {
cb = cb || noop
const exists = nfs.existsSync(filepath)
if (!exists) {
return originalFsMethods.exists(filepath, cb)
}
process.nextTick(() => cb(exists))
} }
} }
// TODO restore patches in restoreFs
if (typeof fs.copyFile === 'function') {
nfs.copyFile = function (filepath: string, dest: string, flags: number, callback: Func) {
setupManifest()
const entry = manifest[getKey(filepath)]
if (!entry) {
return originalFsMethods.copyFile.apply(fs, arguments)
}
if (typeof flags === 'function') {
callback = flags
flags = 0
}
nfs.readFile(filepath, (err: any, buffer: any) => {
if (err) {
return callback(err)
}
originalFsMethods.writeFile(dest, buffer, (err: any) => {
if (err) {
return callback(err)
}
callback(null)
})
})
}
nfs.copyFileSync = function (filepath: string, dest: string) {
setupManifest()
const entry = manifest[getKey(filepath)]
if (!entry) {
return originalFsMethods.copyFileSync.apply(fs, arguments)
}
return originalFsMethods.writeFileSync(dest, nfs.readFileSync(filepath))
}
}
if (typeof fs.realpath.native === 'function') {
nfs.realpath.native = function realpathNative(filepath: any, options: any, cb: any): void {
setupManifest()
const key = getKey(filepath)
if (isString(filepath) && (manifest[filepath] || manifest[key])) {
return process.nextTick(() => cb(null, filepath))
}
return originalFsMethods.realpath.native.call(fs, filepath, options, cb)
}
nfs.realpathSync.native = function realpathSyncNative(filepath: any, options: any) {
setupManifest()
const key = getKey(filepath)
if (manifest[key]) {
return filepath
}
return originalFsMethods.realpathSync.native.call(fs, filepath, options)
}
}
Object.assign(fs, nfs)
lazyRestoreFs = () => { lazyRestoreFs = () => {
Object.keys(nfs).forEach((key) => { Object.assign(fs, originalFsMethods)
fs[key] = originalFsMethods[key] lazyRestoreFs = () => {}
})
lazyRestoreFs = () => void 0
return void 0
} }
return true
} }
function restoreFs() { function restoreFs() {
+15 -17
View File
@@ -1,45 +1,45 @@
import type { Func } from './util.js' import colors from 'chalk'
import { color, esm } from './util.js' import ora from 'ora'
const frameLength = 120 const frameLength = 120
export interface LogStep { export interface LogStep {
modify: (text: string, color?: string) => void modify(text: string, color?: string): void
log: (text: string, color?: string) => void log(text: string, color?: string): void
pause: () => void pause(): void
resume: () => void resume(): void
} }
export class Logger { export class Logger {
public verbose: boolean public verbose: boolean
private readonly silent: boolean private silent: boolean
private ora: any private ora: any
private readonly modify: Func private modify: Function
public write: (text: string, color?: string) => void public write: (text: string, color?: string) => void
constructor(level: 'verbose' | 'silent' | 'info') { constructor(level: 'verbose' | 'silent' | 'info') {
this.verbose = level === 'verbose' this.verbose = level === 'verbose'
this.silent = level === 'silent' this.silent = level === 'silent'
if (!this.silent) { if (!this.silent) {
this.ora = esm.ora?.default({ this.ora = ora({
text: 'Starting...', text: 'Starting...',
color: 'blue', color: 'blue',
spinner: 'dots', spinner: 'dots',
}) })
this.ora.stop() this.ora.stop()
} }
const noop = () => void 0 const noop = () => {}
this.modify = this.silent ? noop : this._modify.bind(this) this.modify = this.silent ? noop : this._modify.bind(this)
this.write = this.silent ? noop : this._write.bind(this) this.write = this.silent ? noop : this._write.bind(this)
} }
async flush() { flush() {
!this.silent && this.ora.succeed() !this.silent && this.ora.succeed()
return await new Promise((resolve) => setTimeout(resolve, frameLength)) return new Promise((resolve) => setTimeout(resolve, frameLength))
} }
_write(update: string, clr = 'green') { _write(update: string, color = 'green') {
this.ora.succeed().text = color(clr, update) this.ora.succeed().text = (colors as any)[color](update)
this.ora.start() this.ora.start()
} }
@@ -48,12 +48,10 @@ export class Logger {
this.ora.color = color this.ora.color = color
} }
step(text: string, method = 'succeed', clr?: string): LogStep { step(text: string, method: string = 'succeed'): LogStep {
if (this.silent) { if (this.silent) {
// eslint-disable-next-line @typescript-eslint/no-empty-function
return { modify() {}, log() {}, pause() {}, resume() {} } return { modify() {}, log() {}, pause() {}, resume() {} }
} }
text = color(clr, text)
if (!this.ora.id) { if (!this.ora.id) {
this.ora.start().text = text this.ora.start().text = text
if (method !== 'succeed') { if (method !== 'succeed') {
+25 -31
View File
@@ -1,22 +1,20 @@
import { NexeCompiler } from './compiler.js' import { EOL } from 'os'
import type { NexeOptions, NexePatch } from './options.js' import { compose } from 'app-builder'
import { normalizeOptions } from './options.js' import { NexeCompiler, NexeError } from './compiler'
import { normalizeOptions, NexeOptions, NexePatch } from './options'
import resource from './steps/resource.js' import resource from './steps/resource'
import clean from './steps/clean.js' import clean from './steps/clean'
import cli from './steps/cli.js' import cli from './steps/cli'
import bundle from './steps/bundle.js' import bundle from './steps/bundle'
import download from './steps/download.js' import download from './steps/download'
import shim from './steps/shim.js' import shim from './steps/shim'
import artifacts from './steps/artifacts.js' import artifacts from './steps/artifacts'
import patches from './patches/index.js' import patches from './patches'
import { initEsm } from './util.js'
async function compile( async function compile(
compilerOptions?: Partial<NexeOptions>, compilerOptions?: Partial<NexeOptions>,
callback?: (err: Error | null) => void callback?: (err: Error | null) => void
) { ) {
await initEsm()
let error: Error | null = null, let error: Error | null = null,
options: NexeOptions | null = null, options: NexeOptions | null = null,
compiler: NexeCompiler | null = null compiler: NexeCompiler | null = null
@@ -24,32 +22,28 @@ async function compile(
try { try {
options = normalizeOptions(compilerOptions) options = normalizeOptions(compilerOptions)
compiler = new NexeCompiler(options) compiler = new NexeCompiler(options)
const plugins = options.plugins as NexePatch[], await compose(
buildSteps = options.build ? [artifacts, ...patches, ...(options.patches as NexePatch[])] : [] clean,
await exec([clean, resource, cli, bundle, shim, download, ...buildSteps, ...plugins], compiler) resource,
cli,
bundle,
shim,
download,
options.build ? [artifacts, ...patches, ...(options.patches as NexePatch[])] : [],
options.plugins as NexePatch[]
)(compiler)
} catch (e: any) { } catch (e: any) {
error = e error = e
} }
if (error) { if (error) {
compiler?.quit(error) compiler && compiler.quit(error)
if (callback) return callback(error) if (callback) return callback(error)
throw error return Promise.reject(error)
} }
if (callback) callback(null) if (callback) callback(null)
} }
export { compile, NexeCompiler } export { compile, NexeCompiler }
export { argv, version, help } from './options.js' export { argv, version, NexeOptions, help } from './options'
export type { NexeOptions } from './options.js'
function exec<T>(mw: any[], ctx: T): Promise<void> | void {
let i = -1
const nxt = (): void | Promise<void> => {
if (++i < mw.length) {
return mw[i](ctx, nxt)
}
}
return nxt()
}
+101 -88
View File
@@ -1,32 +1,25 @@
import { basename, extname, join, isAbsolute, resolve, dirname } from 'node:path'
import { fileURLToPath } from 'node:url'
import { EOL, homedir } from 'node:os'
import { globalAgent } from 'node:https'
import { createRequire } from 'node:module'
const dir = typeof __dirname === 'string' ? __dirname : dirname(fileURLToPath(import.meta.url)),
cjs = createRequire(dir)
import { resolveSync } from 'resolve-dependencies'
import parseArgv from 'minimist' import parseArgv from 'minimist'
import { NexeCompiler, NexeError } from './compiler'
import { isWindows, STDIN_FLAG } from './util'
import { basename, extname, join, isAbsolute, resolve } from 'path'
import { getTarget, NexeTarget } from './target'
import { EOL, homedir } from 'os'
import chalk from 'chalk'
import { resolveSync } from 'resolve-dependencies'
const caw = require('caw')
const c = process.platform === 'win32' ? chalk.constructor({ enabled: false }) : chalk
import caw from 'caw' export const version = '{{ version }}'
import type { NexeCompiler } from './compiler.js' export interface NexePatch {
import { NexeError } from './compiler.js' (compiler: NexeCompiler, next: () => Promise<void>): Promise<void>
import type { NexeTarget } from './target.js' }
import { getTarget } from './target.js'
import { isWindows, STDIN_FLAG, esm } from './util.js'
export const version = '{{replace:0}}'
export type NexePatch = (compiler: NexeCompiler, next: () => Promise<void>) => Promise<void>
export interface NexeOptions { export interface NexeOptions {
build: boolean build: boolean
input: string input: string
output: string output: string
targets: Array<string | NexeTarget> targets: (string | NexeTarget)[]
name: string name: string
remote: string remote: string
asset: string asset: string
@@ -36,12 +29,14 @@ export interface NexeOptions {
configure: string[] configure: string[]
vcBuild: string[] vcBuild: string[]
make: string[] make: string[]
snapshot?: string
resources: string[] resources: string[]
temp: string temp: string
rc: { [key: string]: string }
enableNodeCli: boolean enableNodeCli: boolean
bundle: boolean | string bundle: boolean | string
patches: Array<string | NexePatch> patches: (string | NexePatch)[]
plugins: Array<string | NexePatch> plugins: (string | NexePatch)[]
native: any native: any
mangle: boolean mangle: boolean
ghToken: string ghToken: string
@@ -53,6 +48,7 @@ export interface NexeOptions {
fakeArgv?: boolean fakeArgv?: boolean
verbose?: boolean verbose?: boolean
info?: boolean info?: boolean
ico?: string
debugBundle?: boolean debugBundle?: boolean
warmup?: string warmup?: string
clean?: boolean clean?: boolean
@@ -63,67 +59,66 @@ export interface NexeOptions {
} }
const defaults = { const defaults = {
flags: [], flags: [],
cwd: process.cwd(), cwd: process.cwd(),
fs: true, fs: true,
configure: [], configure: [],
mangle: true, mangle: true,
make: [], make: [],
targets: [], targets: [],
vcBuild: isWindows ? ['nosign', 'release'] : [], vcBuild: isWindows ? ['nosign', 'release'] : [],
enableNodeCli: false, enableNodeCli: false,
build: false, build: false,
bundle: true, bundle: true,
patches: [], patches: [],
plugins: [], plugins: [],
remote: 'https://github.com/nexe/nexe/releases/download/v3.3.3/', remote: 'https://github.com/nexe/nexe/releases/download/v3.3.3/',
}, }
alias = { const alias = {
i: 'input', i: 'input',
o: 'output', o: 'output',
v: 'version', v: 'version',
a: 'asset', a: 'asset',
t: 'target', t: 'target',
b: 'build', b: 'build',
n: 'name', n: 'name',
r: 'resource', r: 'resource',
p: 'python', p: 'python',
f: 'flag', f: 'flag',
c: 'configure', c: 'configure',
m: 'make', m: 'make',
h: 'help', h: 'help',
l: 'loglevel', l: 'loglevel',
'fake-argv': 'fakeArgv', 'fake-argv': 'fakeArgv',
'gh-token': 'ghToken', 'gh-token': 'ghToken',
}, }
argv = parseArgv(process.argv, { alias, default: { ...defaults } }), const argv = parseArgv(process.argv, { alias, default: { ...defaults } })
help = () => { let help = `
const c = esm.chalk?.default as typeof import('chalk').default
return (
EOL +
`
${c.bold('nexe <entry-file> [options]')} ${c.bold('nexe <entry-file> [options]')}
${c.underline.bold('Options:')} ${c.underline.bold('Options:')}
-i --input -- application entry point -i --input -- application entry point
-o --output -- path to output file -o --output -- path to output file
-t --target -- * node version description -t --target -- node version description
-n --name -- main app module name -n --name -- main app module name
-r --resource -- * embed additional files (glob) within the binary -r --resource -- *embed files (glob) within the binary
--remote -- alternate root directory for pre-built base (nexe) binaries from --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 -- python3 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 -- * extend patches applied to source --patch -- module with middleware default export for adding a build patch
--no-mangle -- used when generating base binaries, or when patching _third_party_main manually --no-mangle -- used when generating base binaries, or when patching _third_party_main manually
--sourceUrl -- pass an alternate source tarball (node.tar.gz) url --snapshot -- path to a warmup snapshot
--ico -- file name for alternate icon file (windows)
--rc-* -- populate rc file options (windows)
--sourceUrl -- pass an alternate source (node.tar.gz) url
--enableNodeCli -- enable node cli enforcement (blocks app cli) --enableNodeCli -- enable node cli enforcement (blocks app cli)
${c.underline.bold('Other options:')} ${c.underline.bold('Other options:')}
@@ -136,15 +131,30 @@ ${c.bold('nexe <entry-file> [options]')}
--silent -- disable logging --silent -- disable logging
--verbose -- set logging to verbose --verbose -- set logging to verbose
"*" indicates an option can be used more than once`.trim() + -* variable key name * option can be used more than once`.trim()
EOL help = EOL + help + EOL
)
}
function flatten(...args: any[]): string[] { function flatten(...args: any[]): string[] {
return ([] as string[]).concat(...args).filter((x) => x) return ([] as string[]).concat(...args).filter((x) => x)
} }
/**
* Extract keys such as { "rc-CompanyName": "Node.js" } to
* { CompanyName: "Node.js" }
* @param {*} match
* @param {*} options
*/
function extractCliMap(match: RegExp, options: any) {
return Object.keys(options)
.filter((x) => match.test(x))
.reduce((map: any, option: any) => {
const key = option.split('-')[1]
map[key] = options[option]
delete options[option]
return map
}, {} as any)
}
function extractLogLevel(options: NexeOptions) { function extractLogLevel(options: NexeOptions) {
if (options.loglevel) return options.loglevel if (options.loglevel) return options.loglevel
if (options.silent) return 'silent' if (options.silent) return 'silent'
@@ -158,11 +168,11 @@ function isName(name: string) {
function extractName(options: NexeOptions) { function extractName(options: NexeOptions) {
let name = options.name let name = options.name
// try and use the input filename as the output filename if its not index //try and use the input filename as the output filename if its not index
if (!isName(name) && typeof options.input === 'string') { if (!isName(name) && typeof options.input === 'string') {
name = basename(options.input).replace(extname(options.input), '') name = basename(options.input).replace(extname(options.input), '')
} }
// try and use the directory as the filename //try and use the directory as the filename
if (!isName(name) && basename(options.cwd)) { if (!isName(name) && basename(options.cwd)) {
name = basename(options.cwd) name = basename(options.cwd)
} }
@@ -203,14 +213,14 @@ export function resolveEntry(
const inputPath = padRelative(maybeEntry) const inputPath = padRelative(maybeEntry)
result = resolveSync(cwd, inputPath) result = resolveSync(cwd, inputPath)
} }
if (!process.stdin.isTTY && !result?.absPath && bundle === defaults.bundle) { if (!process.stdin.isTTY && (!result || !result.absPath) && bundle === defaults.bundle) {
return STDIN_FLAG return STDIN_FLAG
} }
if (!result?.absPath) { if (!result || !result.absPath) {
result = resolveSync(cwd, '.') result = resolveSync(cwd, '.')
} }
if (!result.absPath) { if (!result.absPath) {
throw new NexeError(`Entry file "${input || maybeEntry}" not found!`) throw new NexeError(`Entry file "${input || ''}" not found!`)
} }
return result.absPath return result.absPath
} }
@@ -220,9 +230,9 @@ function isCli(options?: Partial<NexeOptions>) {
} }
function normalizeOptions(input?: Partial<NexeOptions>): NexeOptions { function normalizeOptions(input?: Partial<NexeOptions>): NexeOptions {
const options = Object.assign({}, defaults, input) as NexeOptions, const options = Object.assign({}, defaults, input) as NexeOptions
opts = options as any, const opts = options as any
cwd = (options.cwd = resolve(options.cwd)) const cwd = (options.cwd = resolve(options.cwd))
options.temp = options.temp options.temp = options.temp
? resolve(cwd, options.temp) ? resolve(cwd, options.temp)
: process.env.NEXE_TEMP || join(homedir(), '.nexe') : process.env.NEXE_TEMP || join(homedir(), '.nexe')
@@ -233,7 +243,7 @@ function normalizeOptions(input?: Partial<NexeOptions>): NexeOptions {
options.loglevel = extractLogLevel(options) options.loglevel = extractLogLevel(options)
options.flags = flatten(opts.flag, options.flags) options.flags = flatten(opts.flag, options.flags)
options.targets = flatten(opts.target, options.targets).map(getTarget) options.targets = flatten(opts.target, options.targets).map(getTarget)
if (options.targets.length === 0) { if (!options.targets.length) {
options.targets.push(getTarget()) options.targets.push(getTarget())
} }
options.ghToken = options.ghToken || process.env.GITHUB_TOKEN || '' options.ghToken = options.ghToken || process.env.GITHUB_TOKEN || ''
@@ -250,9 +260,12 @@ function normalizeOptions(input?: Partial<NexeOptions>): NexeOptions {
options.downloadOptions.headers['User-Agent'] = 'nexe (https://www.npmjs.com/package/nexe)' options.downloadOptions.headers['User-Agent'] = 'nexe (https://www.npmjs.com/package/nexe)'
options.downloadOptions.agent = process.env.HTTPS_PROXY options.downloadOptions.agent = process.env.HTTPS_PROXY
? caw(process.env.HTTPS_PROXY, { protocol: 'https' }) ? caw(process.env.HTTPS_PROXY, { protocol: 'https' })
: options.downloadOptions.agent || globalAgent : options.downloadOptions.agent || require('https').globalAgent
options.downloadOptions.rejectUnauthorized = !process.env.NODE_TLS_REJECT_UNAUTHORIZED options.downloadOptions.rejectUnauthorized = process.env.NODE_TLS_REJECT_UNAUTHORIZED
? false
: true
options.rc = options.rc || extractCliMap(/^rc-.*/, options)
options.output = options.output =
(options.targets[0] as NexeTarget).platform === 'windows' (options.targets[0] as NexeTarget).platform === 'windows'
? `${(options.output || options.name).replace(/\.exe$/, '')}.exe` ? `${(options.output || options.name).replace(/\.exe$/, '')}.exe`
@@ -261,7 +274,7 @@ function normalizeOptions(input?: Partial<NexeOptions>): NexeOptions {
const requireDefault = (x: string) => { const requireDefault = (x: string) => {
if (typeof x === 'string') { if (typeof x === 'string') {
return cjs(x).default return require(x).default
} }
return x return x
} }
@@ -270,7 +283,7 @@ function normalizeOptions(input?: Partial<NexeOptions>): NexeOptions {
options.plugins = flatten(opts.plugin, options.plugins).map(requireDefault) options.plugins = flatten(opts.plugin, options.plugins).map(requireDefault)
options.patches = flatten(opts.patch, options.patches).map(requireDefault) options.patches = flatten(opts.patch, options.patches).map(requireDefault)
if ((!options.mangle && !options.bundle) || options.patches.length > 0) { if ((!options.mangle && !options.bundle) || options.patches.length) {
options.build = true options.build = true
} }
+7 -8
View File
@@ -1,15 +1,14 @@
/* eslint-disable @typescript-eslint/no-var-requires */ const fs = require('fs'),
const fs = require('fs') fd = fs.openSync(process.execPath, 'r'),
const fd = fs.openSync(process.execPath, 'r'),
stat = fs.statSync(process.execPath), stat = fs.statSync(process.execPath),
tailSize = Math.min(stat.size, 16000), tailSize = Math.min(stat.size, 4096),
tailWindow = Buffer.from(Array(tailSize)) tailWindow = Buffer.from(Array(tailSize))
fs.readSync(fd, tailWindow, 0, tailSize, stat.size - tailSize) fs.readSync(fd, tailWindow, 0, tailSize, stat.size - tailSize)
const footerPosition = tailWindow.indexOf('<nexe~~sentinel>') const footerPosition = tailWindow.indexOf('<nexe~~sentinel>')
if (footerPosition == -1) { if (footerPosition === -1) {
process.stderr.write('\nInvalid Nexe binary\n') process.stderr.write('Invalid Nexe binary')
process.exit(1) process.exit(1)
} }
@@ -50,8 +49,8 @@ Object.defineProperty(
})() })()
) )
const contentBuffer = Buffer.from(Array(contentSize)) const contentBuffer = Buffer.from(Array(contentSize)),
const Module = require('module') Module = require('module')
fs.readSync(fd, contentBuffer, 0, contentSize, contentStart) fs.readSync(fd, contentBuffer, 0, contentSize, contentStart)
fs.closeSync(fd) fs.closeSync(fd)
+17
View File
@@ -0,0 +1,17 @@
import { NexeCompiler } from '../compiler'
export default async function buildFixes(compiler: NexeCompiler, next: () => Promise<void>) {
if (!compiler.target.version.startsWith('8.2')) {
return next()
}
const file = await compiler.readFileAsync('./tools/msvs/find_python.cmd')
await compiler.replaceInFileAsync(
'./tools/msvs/find_python.cmd',
'%p%python.exe -V 2>&1',
'"%p%python.exe" -V 2>&1'
)
return next()
}
+35 -11
View File
@@ -1,20 +1,44 @@
import type { NexeCompiler } from '../compiler.js' import { NexeCompiler } from '../compiler'
import { NexeError } from '../compiler.js' import { semverGt } from '../util'
import { semverGt } from '../util.js'
export default async function disableNodeCli(compiler: NexeCompiler, next: () => Promise<void>) { export default async function disableNodeCli(compiler: NexeCompiler, next: () => Promise<void>) {
if (compiler.options.enableNodeCli) { if (compiler.options.enableNodeCli) {
return await next() return next()
} }
const [regex, replacement] = semverGt(compiler.target.version, '18.99') if (semverGt(compiler.target.version, '11.6.0')) {
? [/(?<!int )ProcessGlobalArgsInternal\(argv[^;]*;/gm, 'ExitCode::kNoFailure'] await compiler.replaceInFileAsync(
: [/(?<!int )ProcessGlobalArgs\(argv[^;]*;/gm, 0], 'src/node.cc',
replaced = await compiler.replaceInFileAsync('src/node.cc', regex, `${replacement};/*$&*/`) /(?<!int )ProcessGlobalArgs\(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] =='
if (!replaced) { await compiler.replaceInFileAsync(
throw new NexeError('There was an error applying the Node CLI patch. Please open an issue.') 'src/node.cc',
`${nodeccMarker} '-'`,
// allow NODE_OPTIONS, introduced in 8.0
semverGt(compiler.target.version, '7.99')
? `(${nodeccMarker} (is_env ? '-' : ']'))`
: `(${nodeccMarker} ']')`
)
} }
return await next() return next()
} }
+5 -10
View File
@@ -1,21 +1,16 @@
import type { NexeCompiler } from '../compiler.js' import { NexeCompiler } from '../compiler'
import { NexeError } from '../compiler.js'
export default async function flags(compiler: NexeCompiler, next: () => Promise<void>) { export default async function flags(compiler: NexeCompiler, next: () => Promise<void>) {
const nodeflags = compiler.options.flags const nodeflags = compiler.options.flags
if (nodeflags.length === 0) { if (!nodeflags.length) {
return await next() return next()
} }
const replaced = await compiler.replaceInFileAsync( await compiler.replaceInFileAsync(
'node.gyp', 'node.gyp',
"'node_v8_options%': ''", "'node_v8_options%': ''",
`'node_v8_options%': '${nodeflags.join(' ')}'` `'node_v8_options%': '${nodeflags.join(' ')}'`
) )
if (!replaced) { return next()
throw new NexeError('Node Flags not applied. Please report an issue')
}
return await next()
} }
+21
View File
@@ -0,0 +1,21 @@
import { NexeCompiler } from '../compiler'
export default async function nodeGyp(
{ files, replaceInFileAsync }: NexeCompiler,
next: () => Promise<void>
) {
await next()
const nodeGypMarker = "'lib/fs.js',"
await replaceInFileAsync(
'node.gyp',
nodeGypMarker,
`
${nodeGypMarker}
${files
.filter((x) => x.filename.startsWith('lib'))
.map((x) => `'${x.filename}'`)
.toString()},
`.trim()
)
}
+12
View File
@@ -0,0 +1,12 @@
import { normalize } from 'path'
import { readFileAsync } from '../util'
import { NexeCompiler } from '../compiler'
export default async function ico(compiler: NexeCompiler, next: () => Promise<void>) {
const iconFile = compiler.options.ico
if (!iconFile) {
return next()
}
await compiler.setFileContentsAsync('src/res/node.ico', await readFileAsync(normalize(iconFile)))
return next()
}
+9 -4
View File
@@ -1,7 +1,12 @@
import bootNexe from './third-party-main.js' import gyp from './gyp'
import cli from './disable-node-cli.js' import bootNexe from './third-party-main'
import flags from './flags.js' import buildFixes from './build-fixes'
import cli from './disable-node-cli'
import flags from './flags'
import ico from './ico'
import rc from './node-rc'
import snapshot from './snapshot'
const patches = [bootNexe, cli, flags] const patches = [gyp, bootNexe, buildFixes, cli, flags, ico, rc, snapshot]
export default patches export default patches
+28
View File
@@ -0,0 +1,28 @@
import { NexeCompiler } from '../compiler'
export default async function nodeRc(compiler: NexeCompiler, next: () => Promise<void>) {
const options = compiler.options.rc
if (!options) {
return next()
}
const file = await compiler.readFileAsync('src/res/node.rc')
Object.keys(options).forEach((key) => {
let value = options[key]
const isVar = /^[A-Z_]+$/.test(value)
value = isVar ? value : `"${value}"`
file.contents = file.contents
.toString()
.replace(new RegExp(`VALUE "${key}",.*`), `VALUE "${key}", ${value}`)
})
;['PRODUCTVERSION', 'FILEVERSION'].forEach((x) => {
if (options[x]) {
file.contents = file.contents
.toString()
.replace(new RegExp(x + ' .*$', 'm'), `${x} ${options[x]}`)
}
})
return next()
}
+27
View File
@@ -0,0 +1,27 @@
import { resolve } from 'path'
import { NexeCompiler } from '../compiler'
import { semverGt } from '../util'
export default async function (compiler: NexeCompiler, next: () => Promise<void>) {
const { snapshot, warmup, cwd } = compiler.options
if (!snapshot) {
return next()
}
const variablePrefix = semverGt(compiler.target.version, '11.0.0') ? 'v8_' : ''
await compiler.replaceInFileAsync(
compiler.configureScript,
'def configure_v8(o):',
`def configure_v8(o):\n o['variables']['${variablePrefix}embed_script'] = r'${resolve(
cwd,
snapshot
)}'\n o['variables']['${variablePrefix}warmup_script'] = r'${resolve(
cwd,
warmup || snapshot
)}'`
)
return next()
}
+89 -68
View File
@@ -1,78 +1,14 @@
import { NexeCompiler } from '../compiler'
import { parse } from 'meriyah' import { parse } from 'meriyah'
import type { NexeCompiler } from '../compiler.js' import { wrap, semverGt } from '../util'
import { NexeError } from '../compiler.js'
import { wrap, semverGt } from '../util.js'
export default async function main(compiler: NexeCompiler, next: () => Promise<void>) { function walkSome(node: any, visit: Function) {
let bootFile = 'lib/internal/bootstrap/pre_execution.js'
if (semverGt(compiler.target.version, '18.11.99')) {
bootFile = 'lib/internal/process/pre_execution.js'
}
const file = await compiler.readFileAsync(bootFile),
ast = parse(file.contents.toString(), {
next: true,
globalReturn: true,
loc: true,
specDeviation: true,
}),
location = { start: { line: 0 } }
walkSome(ast, (node: any) => {
if (!location.start.line && node.type === 'BlockStatement') {
// Find the first block statement and mark the location
Object.assign(location, node.loc)
return true
}
})
const fileLines = file.contents.toString().split('\n')
fileLines.splice(
location.start.line,
0,
'{{replace:lib/MOD/fs/bootstrap.js}}' + '\n' + 'expandArgv1 = false;\n'
)
file.contents = fileLines.join('\n')
const boot = await compiler.replaceInFileAsync(
bootFile,
'initializeFrozenIntrinsics();',
'initializeFrozenIntrinsics();\n' + wrap('{{replace:lib/MOD/patches/boot-nexe.js}}')
),
userModuleAssertion = await compiler.replaceInFileAsync(
bootFile,
'assert(!CJSLoader.hasLoadedAnyUserCJSModule)',
'/*assert(!CJSLoader.hasLoadedAnyUserCJSModule)*/'
),
workerSupport = await compiler.replaceInFileAsync(
'src/node.cc',
'if (env->worker_context() != nullptr) {',
'if (env->worker_context() == nullptr) {\n' +
' return StartExecution(env, "internal/main/run_main_module"); } else {\n'
)
assertPatches({ boot, userModuleAssertion, workerSupport })
return await next()
}
function assertPatches(patches: Record<string, boolean>) {
if (!Object.values(patches).every((x) => x)) {
let message = ''
Object.entries(patches).forEach(([k, v]) => {
if (!v) message += `\nFailed to apply patch for: "${k}". Please open an issue.`
})
throw new NexeError(message.trim())
}
}
function walkSome(node: any, visit: (node: any) => boolean | undefined) {
if (!node || typeof node.type !== 'string' || node._visited) { if (!node || typeof node.type !== 'string' || node._visited) {
return false return false
} }
visit(node) visit(node)
node._visited = true node._visited = true
for (const childNode in node) { for (let childNode in node) {
const child = node[childNode] const child = node[childNode]
if (Array.isArray(child)) { if (Array.isArray(child)) {
for (let i = 0; i < child.length; i++) { for (let i = 0; i < child.length; i++) {
@@ -86,3 +22,88 @@ function walkSome(node: any, visit: (node: any) => boolean | undefined) {
} }
return false return false
} }
export default async function main(compiler: NexeCompiler, next: () => Promise<void>) {
let bootFile = 'lib/internal/bootstrap_node.js'
const { version } = compiler.target
if (version.startsWith('4.')) {
bootFile = 'src/node.js'
} else if (semverGt(version, '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')
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()
}
+9 -11
View File
@@ -1,4 +1,5 @@
import { platforms, architectures, NexeTarget, getTarget, targetsEqual } from './target.js' import got = require('got')
import { platforms, architectures, NexeTarget, getTarget, targetsEqual } from './target'
export { NexeTarget } export { NexeTarget }
const versionsToSkip = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 11, 13, 15, 17, 19, 21, 22] const versionsToSkip = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 11, 13, 15, 17, 19, 21, 22]
@@ -20,7 +21,6 @@ interface NodeRelease {
} }
async function getJson<T>(url: string, options?: any) { async function getJson<T>(url: string, options?: any) {
const { default: got } = await import('got')
return JSON.parse((await got(url, options)).body) as T return JSON.parse((await got(url, options)).body) as T
} }
@@ -31,19 +31,17 @@ function isBuildableVersion(version: string) {
return !versionsToSkip.includes(Number(version.split('.')[0])) return !versionsToSkip.includes(Number(version.split('.')[0]))
} }
export async function getLatestGitRelease(options?: any) { export function getLatestGitRelease(options?: any) {
return await getJson<GitRelease>( return getJson<GitRelease>('https://api.github.com/repos/nexe/nexe/releases/latest', options)
'https://api.github.com/repos/nexe/nexe/releases/latest',
options
)
} }
export async function getUnBuiltReleases(options?: any) { export async function getUnBuiltReleases(options?: any) {
const nodeReleases = await getJson<NodeRelease[]>( const nodeReleases = await getJson<NodeRelease[]>(
'https://nodejs.org/download/release/index.json' 'https://nodejs.org/download/release/index.json'
), )
existingVersions = (await getLatestGitRelease(options)).assets.map((x) => getTarget(x.name)), const existingVersions = (await getLatestGitRelease(options)).assets.map((x) => getTarget(x.name))
versionMap: { [key: string]: true } = {}
const versionMap: { [key: string]: true } = {}
return nodeReleases return nodeReleases
.reduce((versions: NexeTarget[], { version }) => { .reduce((versions: NexeTarget[], { version }) => {
version = version.replace('v', '').trim() version = version.replace('v', '').trim()
+29 -23
View File
@@ -1,22 +1,28 @@
import { join, dirname } from 'node:path' import { join, dirname } from 'path'
import { unlink, readdir, mkdir } from 'node:fs/promises' import * as fs from 'fs'
import { promisify } from 'util'
import { readFileAsync, writeFileAsync, isDirectoryAsync } from '../util'
import mkdirpAsync = require('mkdirp')
import { NexeCompiler } from '../compiler'
import { readFile, writeFile, isDirectory } from '../util.js' const unlinkAsync = promisify(fs.unlink),
import type { NexeCompiler } from '../compiler.js' readdirAsync = promisify(fs.readdir)
async function readDirAsync(dir: string): Promise<string[]> { function readDirAsync(dir: string): Promise<string[]> {
return await readdir(dir).then(async (paths) => { return readdirAsync(dir).then((paths) => {
return await Promise.all( return Promise.all(
paths.map(async (file: string) => { paths.map((file: string) => {
const path = join(dir, file) const path = join(dir, file)
return await isDirectory(path).then((x) => (x ? readDirAsync(path) : (path as any))) return isDirectoryAsync(path).then((x) => (x ? readDirAsync(path) : (path as any)))
}) })
).then((result) => result.flat()) ).then((result) => {
return [].concat(...(result as any))
})
}) })
} }
async function maybeReadFileContentsAsync(file: string) { function maybeReadFileContentsAsync(file: string) {
return await readFile(file, 'utf-8').catch((e) => { return readFileAsync(file, 'utf-8').catch((e) => {
if (e.code === 'ENOENT') { if (e.code === 'ENOENT') {
return '' return ''
} }
@@ -34,28 +40,28 @@ async function maybeReadFileContentsAsync(file: string) {
* - Finally, The patched files are written into source. * - Finally, The patched files are written into source.
*/ */
export default async function artifacts(compiler: NexeCompiler, next: () => Promise<void>) { export default async function artifacts(compiler: NexeCompiler, next: () => Promise<void>) {
const { src } = compiler, const { src } = compiler
temp = join(src, 'nexe') const temp = join(src, 'nexe')
await mkdir(temp, { recursive: true }) await mkdirpAsync(temp)
const tmpFiles = await readDirAsync(temp) const tmpFiles = await readDirAsync(temp)
await Promise.all( await Promise.all(
tmpFiles.map(async (path) => { tmpFiles.map(async (path) => {
return await compiler.writeFileAsync(path.replace(temp, ''), await readFile(path, 'utf-8')) return compiler.writeFileAsync(path.replace(temp, ''), await readFileAsync(path, 'utf-8'))
}) })
) )
await next() await next()
await Promise.all(tmpFiles.map(async (x) => await unlink(x))) await Promise.all(tmpFiles.map((x) => unlinkAsync(x)))
return await Promise.all( return Promise.all(
compiler.files.map(async (file) => { compiler.files.map(async (file) => {
const sourceFile = join(src, file.filename), const sourceFile = join(src, file.filename)
tempFile = join(temp, file.filename), const tempFile = join(temp, file.filename)
fileContents = await maybeReadFileContentsAsync(sourceFile) const fileContents = await maybeReadFileContentsAsync(sourceFile)
await mkdir(dirname(tempFile), { recursive: true }) await mkdirpAsync(dirname(tempFile))
await writeFile(tempFile, fileContents) await writeFileAsync(tempFile, fileContents)
await compiler.writeFileAsync(file.filename, file.contents) await compiler.writeFileAsync(file.filename, file.contents)
}) })
) )
+21 -17
View File
@@ -1,14 +1,12 @@
import { resolve, relative } from 'node:path' import { NexeCompiler, NexeError } from '../compiler'
import type { Readable } from 'node:stream' import { resolve, relative } from 'path'
import resolveFiles, { resolveSync } from 'resolve-dependencies' import resolveFiles, { resolveSync } from 'resolve-dependencies'
import { dequote, STDIN_FLAG, semverGt, each } from '../util'
import { Readable } from 'stream'
import type { NexeCompiler } from '../compiler.js' function getStdIn(stdin: Readable): Promise<string> {
import { NexeError } from '../compiler.js'
import { dequote, STDIN_FLAG } from '../util.js'
async function getStdIn(stdin: Readable): Promise<string> {
let out = '' let out = ''
return await new Promise((resolve) => { return new Promise((resolve) => {
stdin stdin
.setEncoding('utf8') .setEncoding('utf8')
.on('readable', () => { .on('readable', () => {
@@ -30,7 +28,12 @@ export default async function bundle(compiler: NexeCompiler, next: any) {
const { bundle: doBundle, cwd, input: inputPath } = compiler.options const { bundle: doBundle, cwd, input: inputPath } = compiler.options
let input = inputPath let input = inputPath
compiler.entrypoint = './' + relative(cwd, input) compiler.entrypoint = './' + relative(cwd, input)
compiler.startup = ''
if (semverGt(compiler.target.version, '11.99')) {
compiler.startup = ''
} else {
compiler.startup = ';require("module").runMain();'
}
if (!doBundle) { if (!doBundle) {
await compiler.addResource(resolve(cwd, input)) await compiler.addResource(resolve(cwd, input))
@@ -39,7 +42,6 @@ export default async function bundle(compiler: NexeCompiler, next: any) {
let code = '' let code = ''
if (typeof doBundle === 'string') { if (typeof doBundle === 'string') {
// eslint-disable-next-line @typescript-eslint/no-var-requires
code = await require(doBundle).createBundle(compiler.options) code = await require(doBundle).createBundle(compiler.options)
} }
@@ -59,24 +61,26 @@ export default async function bundle(compiler: NexeCompiler, next: any) {
compiler.entrypoint = './' + relative(cwd, input) compiler.entrypoint = './' + relative(cwd, input)
} }
const { files, warnings } = resolveFiles( const step = compiler.log.step('Resolving dependencies...')
const { files, warnings } = await resolveFiles(
input, input,
...Object.keys(compiler.bundle.list).filter((x) => x.endsWith('.js')), ...Object.keys(compiler.bundle.list).filter((x) => x.endsWith('.js') || x.endsWith('.mjs')),
{ cwd, expand: 'variable', loadContent: false } { cwd, expand: 'variable', loadContent: false }
) )
if ( if (
warnings.filter((x) => x.startsWith('Error parsing file') && !x.includes('node_modules')) warnings.filter((x) => x.startsWith('Error parsing file') && !x.includes('node_modules')).length
.length > 0
) { ) {
throw new NexeError('Parsing Error:\n' + warnings.join('\n')) throw new NexeError('Parsing Error:\n' + warnings.join('\n'))
} }
warnings.forEach((x: string) => compiler.log.step('[WARNING]: ' + x, 'stopAndPersist', 'yellow')) //TODO: warnings.forEach((x) => console.log(x))
await Promise.all( await Promise.all(
Object.entries(files).map(async ([key, file]) => { Object.entries(files).map(([key]) => {
return await compiler.addResource(key, file) step.log(`Including dependency: ${key}`)
return compiler.addResource(key)
}) })
) )
+6 -7
View File
@@ -1,7 +1,6 @@
import { rm } from 'node:fs/promises' import { NexeCompiler } from '../compiler'
import { rimrafAsync } from '../util'
import type { NexeCompiler } from '../compiler.js' import { NexeTarget } from '../target'
import type { NexeTarget } from '../target.js'
export default async function clean(compiler: NexeCompiler, next: () => Promise<any>) { export default async function clean(compiler: NexeCompiler, next: () => Promise<any>) {
const { options } = compiler const { options } = compiler
@@ -12,9 +11,9 @@ export default async function clean(compiler: NexeCompiler, next: () => Promise<
} }
const step = compiler.log.step('Cleaning up nexe build artifacts...') const step = compiler.log.step('Cleaning up nexe build artifacts...')
step.log(`Deleting contents at: ${path}`) step.log(`Deleting contents at: ${path}`)
await rm(path, { recursive: true, force: true }) await rimrafAsync(path)
step.log(`Deleted contents at: ${path}`) step.log(`Deleted contents at: ${path}`)
return await compiler.quit() return compiler.quit()
} }
return await next() return next()
} }
+9 -8
View File
@@ -1,8 +1,9 @@
import { dirname, normalize, relative, resolve } from 'node:path' import { dirname, normalize, relative, resolve } from 'path'
import { createWriteStream, chmodSync, statSync, mkdirSync } from 'node:fs' import { createWriteStream, chmodSync, statSync } from 'fs'
import type { NexeCompiler } from '../compiler.js' import { NexeCompiler } from '../compiler'
import type { NexeTarget } from '../target.js' import { NexeTarget } from '../target'
import { STDIN_FLAG } from '../util.js' import { STDIN_FLAG } from '../util'
import mkdirp = require('mkdirp')
/** /**
* The "cli" step detects the appropriate input. If no input options are passed, * The "cli" step detects the appropriate input. If no input options are passed,
@@ -19,11 +20,11 @@ export default async function cli(compiler: NexeCompiler, next: () => Promise<vo
const { log } = compiler, const { log } = compiler,
target = compiler.options.targets.shift() as NexeTarget, target = compiler.options.targets.shift() as NexeTarget,
deliverable = await compiler.compileAsync(target), deliverable = await compiler.compileAsync(target),
output = normalize(compiler.output) output = normalize(compiler.output!)
mkdirSync(dirname(output), { recursive: true }) mkdirp.sync(dirname(output))
return await new Promise((res, rej) => { return new Promise((res, rej) => {
const step = log.step('Writing result to file') const step = log.step('Writing result to file')
deliverable deliverable
.pipe(createWriteStream(output)) .pipe(createWriteStream(output))
+13 -17
View File
@@ -1,19 +1,15 @@
import { dirname } from 'node:path' import download = require('download')
import { pathExistsAsync } from '../util'
import download from 'download' import { LogStep } from '../logger'
import { IncomingMessage } from 'http'
import { pathExists } from '../util.js' import { NexeCompiler, NexeError } from '../compiler'
import type { LogStep } from '../logger.js' import { dirname } from 'path'
import type { NexeCompiler } from '../compiler.js'
import { NexeError } from '../compiler.js'
import type { IncomingMessage } from 'node:http'
function fetchNodeSourceAsync(dest: string, url: string, step: LogStep, options = {}) { function fetchNodeSourceAsync(dest: string, url: string, step: LogStep, options = {}) {
const setText = (p: number) => step.modify(`Downloading Node: ${p.toFixed()}%...`) const setText = (p: number) => step.modify(`Downloading Node: ${p.toFixed()}%...`)
return download(url, dest, Object.assign(options, { extract: true, strip: 1 })) return download(url, dest, Object.assign(options, { extract: true, strip: 1 }))
.on('response', (res: IncomingMessage) => { .on('response', (res: IncomingMessage) => {
const total = Number(res.headers['content-length']) const total = +res.headers['content-length']!
let current = 0 let current = 0
res.on('data', (data) => { res.on('data', (data) => {
current += data.length current += data.length
@@ -34,11 +30,11 @@ async function fetchPrebuiltBinary(compiler: NexeCompiler, step: any) {
await download(remoteAsset, dirname(filename), compiler.options.downloadOptions).on( await download(remoteAsset, dirname(filename), compiler.options.downloadOptions).on(
'response', 'response',
(res: IncomingMessage) => { (res: IncomingMessage) => {
const total = Number(res.headers['content-length']) const total = +res.headers['content-length']!
let current = 0 let current = 0
res.on('data', (data) => { res.on('data', (data) => {
current += data.length current += data.length
step?.modify(`Downloading...${((current / total) * 100).toFixed()}%`) step!.modify(`Downloading...${((current / total) * 100).toFixed()}%`)
}) })
} }
) )
@@ -62,14 +58,14 @@ export default async function downloadNode(compiler: NexeCompiler, next: () => P
{ sourceUrl, downloadOptions, build } = compiler.options, { sourceUrl, downloadOptions, build } = compiler.options,
url = sourceUrl || `https://nodejs.org/dist/v${version}/node-v${version}.tar.gz`, url = sourceUrl || `https://nodejs.org/dist/v${version}/node-v${version}.tar.gz`,
step = log.step( step = log.step(
`Downloading ${build ? '' : 'pre-built '}Node.js${build ? ` source from: ${url}` : ''}` `Downloading ${build ? '' : 'pre-built '}Node.js${build ? `source from: ${url}` : ''}`
), ),
exeLocation = compiler.getNodeExecutableLocation(build ? undefined : target), exeLocation = compiler.getNodeExecutableLocation(build ? undefined : target),
downloadExists = await pathExists(build ? src : exeLocation) downloadExists = await pathExistsAsync(build ? src : exeLocation)
if (downloadExists) { if (downloadExists) {
step.log('Already downloaded...') step.log('Already downloaded...')
return await next() return next()
} }
if (build) { if (build) {
@@ -78,5 +74,5 @@ export default async function downloadNode(compiler: NexeCompiler, next: () => P
await fetchPrebuiltBinary(compiler, step) await fetchPrebuiltBinary(compiler, step)
} }
return await next() return next()
} }
+15 -24
View File
@@ -1,34 +1,25 @@
import { relative } from 'node:path' import { each } from '../util'
import globs from 'globby'
import fg from 'fast-glob' import { resolve } from 'path'
import { NexeCompiler } from '../compiler'
import { each } from '../util.js'
import type { NexeCompiler } from '../compiler.js'
export default async function resource(compiler: NexeCompiler, next: () => Promise<any>) { export default async function resource(compiler: NexeCompiler, next: () => Promise<any>) {
const { cwd, resources } = compiler.options const { cwd, resources } = compiler.options
if (resources.length === 0) { if (!resources.length) {
return await next() return next()
} }
const step = compiler.log.step('Bundling Resources...')
let count = 0 let count = 0
resources.forEach((x: string) => { // workaround for https://github.com/sindresorhus/globby/issues/127
if (x.includes('node_modules/**')) { // and https://github.com/mrmlnc/fast-glob#pattern-syntax
compiler.log.step( const resourcesWithForwardSlashes = resources.map((r) => r.replace(/\\/g, '/'))
`[WARNING]: pattern "${x}" will include many files, consider narrowing the pattern`,
'stopAndPersist',
'yellow'
)
}
})
const step = compiler.log.step('Bundling Resources...') await each(globs(resourcesWithForwardSlashes, { cwd, onlyFiles: true }), async (file) => {
await each(fg(resources, { cwd, absolute: true, onlyFiles: true }), async (file) => {
count++ count++
step.log(`Including file: ${relative(cwd, file)}`) step.log(`Including file: ${file}`)
await compiler.addResource(file) await compiler.addResource(resolve(cwd, file))
}) })
compiler.log.step(`Included ${count} file(s)`, 'stopAndPersist') step.log(`Included ${count} file(s)`)
return await next() return next()
} }
+14 -6
View File
@@ -1,14 +1,22 @@
import type { NexeCompiler } from '../compiler.js' import { NexeCompiler } from '../compiler'
import { wrap } from '../util.js' import { wrap } from '../util'
export default async function (compiler: NexeCompiler, next: () => Promise<void>) { export default async function (compiler: NexeCompiler, next: () => Promise<void>) {
await next() await next()
compiler.shims.push( compiler.shims.push(
wrap( wrap(
'' + [
'{{replace:lib/MOD/fs/patch.js}}' + 'process.__nexe = {};',
'\nshimFs(process.__nexe)' + 'const fsPatcher = (function() {',
`\n${compiler.options.fs ? '' : 'restoreFs()'}` '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(
+24 -24
View File
@@ -13,29 +13,30 @@ export interface NexeTarget {
} }
const prettyPlatform: { [key: string]: NodePlatform } = { const prettyPlatform: { [key: string]: NodePlatform } = {
win32: 'windows', win32: 'windows',
windows: 'windows', windows: 'windows',
win: 'windows', win: 'windows',
darwin: 'mac', darwin: 'mac',
macos: 'mac', macos: 'mac',
mac: 'mac', mac: 'mac',
linux: 'linux', linux: 'linux',
static: 'alpine', static: 'alpine',
alpine: 'alpine', alpine: 'alpine',
}, }
prettyArch: { [key: string]: NodeArch } = {
x86: 'x86', const prettyArch: { [key: string]: NodeArch } = {
arm6: 'arm', x86: 'x86',
arm64: 'arm64', arm6: 'arm',
arm6l: 'arm', arm64: 'arm64',
arm: 'arm', arm6l: 'arm',
arm7: 'arm', arm: 'arm',
arm7l: 'arm', arm7: 'arm',
amd64: 'x64', arm7l: 'arm',
ia32: 'x86', amd64: 'x64',
x32: 'x86', ia32: 'x86',
x64: 'x64', x32: 'x86',
} x64: 'x64',
}
function isVersion(x: string) { function isVersion(x: string) {
if (!x) { if (!x) {
@@ -57,7 +58,6 @@ class Target implements NexeTarget {
toJSON() { toJSON() {
return this.toString() return this.toString()
} }
toString() { toString() {
return `${this.platform}-${this.arch}-${this.version}` return `${this.platform}-${this.arch}-${this.version}`
} }
+1 -4
View File
@@ -6,11 +6,8 @@ declare module 'got' {
const got: GotFn const got: GotFn
export = got export = got
} }
declare module 'caw'
declare module 'download' { declare module 'download' {
import type { Duplex } from 'stream' import { Duplex } from 'stream'
interface DownloadOptions { interface DownloadOptions {
extract?: boolean extract?: boolean
strip?: number strip?: number
+32 -49
View File
@@ -1,40 +1,17 @@
import { readFile, writeFile, stat } from 'node:fs/promises' import { readFile, writeFile, stat } from 'fs'
import { execFile as exec } from 'node:child_process' import { execFile } from 'child_process'
import { promisify } from 'node:util' import { promisify } from 'util'
import rimraf = require('rimraf')
const rimrafAsync = promisify(rimraf)
export const STDIN_FLAG = '[stdin]' export const STDIN_FLAG = '[stdin]'
export const esm: {
chalk: typeof import('chalk') | null
ora: typeof import('ora') | null
got: typeof import('got') | null
} = {
got: null,
chalk: null,
ora: null,
}
export async function initEsm() {
await Promise.all(
(['chalk', 'got', 'ora'] as const).map(async (x) => {
esm[x] = await import(x)
})
)
}
const id = (x: any) => x
export function color(color?: string, text?: string) {
return !color ? text : ((esm.chalk?.default as any)[color] || id)(text)
}
export type Func<T = any, Args = any> = (...args: Args[]) => T
export async function each<T>( export async function each<T>(
list: T[] | Promise<T[]>, list: T[] | Promise<T[]>,
action: (item: T, index: number, list: T[]) => Promise<any> action: (item: T, index: number, list: T[]) => Promise<any>
) { ) {
const l = await list const l = await list
return await Promise.all(l.map(action)) return Promise.all(l.map(action))
} }
export function wrap(code: string) { export function wrap(code: string) {
@@ -53,8 +30,8 @@ function padRight(str: string, l: number) {
} }
const bound: MethodDecorator = function bound<T>( const bound: MethodDecorator = function bound<T>(
target: object, target: Object,
propertyKey: string | symbol, propertyKey: string | Symbol,
descriptor: TypedPropertyDescriptor<T> descriptor: TypedPropertyDescriptor<T>
) { ) {
const configurable = true const configurable = true
@@ -74,8 +51,8 @@ const bound: MethodDecorator = function bound<T>(
function dequote(input: string) { function dequote(input: string) {
input = input.trim() input = input.trim()
const singleQuote = input.startsWith("'") && input.endsWith("'"), const singleQuote = input.startsWith("'") && input.endsWith("'")
doubleQuote = input.startsWith('"') && input.endsWith('"') const doubleQuote = input.startsWith('"') && input.endsWith('"')
if (singleQuote || doubleQuote) { if (singleQuote || doubleQuote) {
return input.slice(1).slice(0, -1) return input.slice(1).slice(0, -1)
} }
@@ -87,25 +64,30 @@ export interface ReadFileAsync {
(path: string, encoding: string): Promise<string> (path: string, encoding: string): Promise<string>
} }
const execFile = promisify(exec), const readFileAsync = promisify(readFile)
isWindows = process.platform === 'win32' const writeFileAsync = promisify(writeFile)
const statAsync = promisify(stat)
const execFileAsync = promisify(execFile)
const isWindows = process.platform === 'win32'
async function pathExists(path: string) { function pathExistsAsync(path: string) {
return await stat(path) return statAsync(path)
.then(() => true) .then((x) => true)
.catch(falseOnEnoent) .catch(falseOnEnoent)
} }
async function isDirectory(path: string) { function isDirectoryAsync(path: string) {
return await stat(path) return statAsync(path)
.then((x) => x.isDirectory()) .then((x) => x.isDirectory())
.catch(falseOnEnoent) .catch(falseOnEnoent)
} }
/**
* @param version See if this version is greather than the second one
* @param operand Version to compare against
*/
function semverGt(version: string, operand: string) { function semverGt(version: string, operand: string) {
const [cMajor, cMinor, cPatch] = version.split('.').map(Number) const [cMajor, cMinor, cPatch] = version.split('.').map(Number)
let [major, minor, patch] = operand.split('.').map(Number) let [major, minor, patch] = operand.split('.').map(Number)
major = Number(major)
if (!minor) minor = 0 if (!minor) minor = 0
if (!patch) patch = 0 if (!patch) patch = 0
return ( return (
@@ -118,13 +100,14 @@ function semverGt(version: string, operand: string) {
export { export {
dequote, dequote,
padRight, padRight,
semverGt,
bound, bound,
isWindows, isWindows,
stat, rimrafAsync,
execFile, statAsync,
readFile, execFileAsync,
pathExists, readFileAsync,
isDirectory, pathExistsAsync,
writeFile, isDirectoryAsync,
semverGt, writeFileAsync,
} }
+97 -46
View File
@@ -1,43 +1,104 @@
import { env } from 'node:process' import * as nexe from '../lib/nexe'
import { execSync } from 'node:child_process' import { getUnBuiltReleases, getLatestGitRelease } from '../lib/releases'
import { buildArm, buildAlpine } from './docker.js' import { runDockerBuild } from './docker'
import { getTarget, targetsEqual, NexeTarget } from '../lib/target'
import { pathExistsAsync, readFileAsync, execFileAsync, semverGt } from '../lib/util'
import got from 'got'
import { cpus } from 'os'
export async function build(target = env.NEXE_TARGET || null) { const env = process.env,
if (!target?.trim()) { isPullRequest = env.BUILD_REASON === 'PullRequest',
throw new Error('Environment variable NEXE_TARGET not found. Received: ' + target) isWindows = process.platform === 'win32',
isLinux = process.platform === 'linux',
buildHost = env.AGENT_JOBNAME || (isWindows && 'windows_2017_2015') || '',
isMac = process.platform === 'darwin',
headers = {
Authorization: 'token ' + env.GITHUB_TOKEN,
'User-Agent': 'nexe (https://www.npmjs.com/package/nexe)',
} }
const done = keepalive() if (require.main === module) {
let file = '' if (!isPullRequest) {
try { build().catch((x) => {
if (target.includes('alpine')) { console.error(x)
file = await buildAlpine(target) process.exit(1)
} else if (target.includes('arm')) { })
file = await buildArm(target) }
} else { }
file = await nexeBuild(target)
assertNexeBinary(file) async function build() {
const releases = await getUnBuiltReleases({ headers })
if (!releases.length) {
return
}
const windowsBuild = releases.find((x) => x.platform === 'windows'),
macBuild = releases.find((x) => x.platform === 'mac'),
linux = releases.find((x) => x.platform === 'linux'),
alpine = releases.find((x) => x.platform === 'alpine')
let target: NexeTarget | undefined
if (env.NEXE_VERSION) target = getTarget(env.NEXE_VERSION)
else if (isWindows) target = windowsBuild
else if (isMac) target = macBuild
else if (isLinux) target = linux
if (buildHost.includes('alpine')) target = alpine
if (!target) {
return console.log('Nothing to build...')
}
if (isWindows && buildHost.includes('2017') && !semverGt(target.version, '9.99.99')) {
return console.log(`Not building ${target} on this host...`)
}
if (isWindows && buildHost.includes('2015') && semverGt(target.version, '9.99.99')) {
return console.log(`Not building ${target} on this host...`)
}
const output = isWindows ? './out.exe' : './out',
options = {
mangle: false,
build: true,
verbose: Boolean(env.NEXE_VERBOSE!),
target,
make: ['-j' + cpus().length],
output,
} }
} catch (e: any) { console.log('Building: ' + target + ' on ' + buildHost)
done() const stop = keepalive()
throw e
if (
[/*'arm7l', 'arm6l', 'arm64', */ 'alpine'].includes(target.platform) &&
buildHost.includes('alpine')
) {
await runDockerBuild(target)
} else {
await nexe.compile(options)
} }
stop()
if (!file) { if (await pathExistsAsync(output)) {
throw new Error('Binary failed to build') await assertNexeBinary(output)
const gitRelease = await 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)
} }
uploadBinary(target, file)
}
function nexeBuild(target: string) {
console.log('building: ' + target)
return Promise.resolve('')
}
function uploadBinary(target: string, file: string) {
void file
console.log('uploading to release')
} }
function keepalive() { function keepalive() {
@@ -46,20 +107,10 @@ function keepalive() {
} }
function assertNexeBinary(file: string) { function assertNexeBinary(file: string) {
if (!file) throw new Error('Invalid filename: "' + file + '"') return execFileAsync(file).catch((e) => {
let result = ''
try {
result = execSync(file).toString('utf8')
} catch (e: any) {
if (e && e.stack && e.stack.includes('Invalid Nexe binary')) { if (e && e.stack && e.stack.includes('Invalid Nexe binary')) {
return return
} }
throw e throw e
} })
throw new Error('Not a bare nexe binary: ' + result)
} }
build().catch((e) => {
console.error(e)
process.exit(1)
})
-2
View File
@@ -1,2 +0,0 @@
export declare function buildArm(target: string): Promise<string>
export declare function buildAlpine(target: string): Promise<string>
+71 -6
View File
@@ -1,9 +1,74 @@
export function buildArm(target: string) { import { NexeTarget, architectures } from '../lib/target'
console.log('building arm: ' + target) import { writeFileAsync, readFileAsync } from '../lib/util'
return Promise.resolve('') import got from 'got'
import execa = require('execa')
import { appendFileSync } from 'fs'
function alpine(target: NexeTarget) {
return `
FROM ${target.arch === 'x64' ? '' : 'i386/'}alpine:3.12
RUN apk add --no-cache curl make gcc g++ binutils-gold python linux-headers paxctl libgcc libstdc++ git vim tar gzip wget
ENV NODE_VERSION=${target.version}
ENV NEXE_VERSION=latest
WORKDIR /
RUN curl -sSL https://nodejs.org/dist/v\${NODE_VERSION}/node-v\${NODE_VERSION}.tar.gz | tar -xz && \
mkdir /nexe_temp && mv /node-v\${NODE_VERSION} /nexe_temp/\${NODE_VERSION} && \
cd /nexe_temp/\${NODE_VERSION} && \
./configure --prefix=/usr --fully-static && \
make && make install && \
paxctl -cm /usr/bin/node
RUN rm /nexe_temp/\${NODE_VERSION}/out/Release/node && \
npm install -g nexe@\${NEXE_VERSION}
RUN echo "console.log('hello world')" >> index.js && \
nexe --build --no-mangle --temp /nexe_temp -c="--fully-static" -o out
`.trim()
} }
export function buildAlpine(target: string) { function arm(target: NexeTarget) {
console.log('building alpine: ' + target) return `
return Promise.resolve('') FROM hypriot/rpi-node
ENV NEXE_VERSION=latest
WORKDIR /
RUN yarn global add nexe@\${NEXE_VERSION} && \
nexe --build --no-mangle -o out -t ${target.version}
`.trim()
}
export async function runDockerBuild(target: NexeTarget) {
//todo switch on alpine and arm
const dockerfile = alpine(target)
await writeFileAsync('Dockerfile', dockerfile)
const outFilename = 'nexe-docker-build-log.txt'
await writeFileAsync(outFilename, '')
let output: any = []
try {
output.push(await execa(`docker build -t nexe-docker .`, { shell: true }))
output.push(await execa(`docker run -d --name nexe nexe-docker sh`, { shell: true }))
output.push(await execa(`docker cp nexe:/out out`, { shell: true }))
output.push(await execa(`docker rm nexe`, { shell: true }))
} catch (e: any) {
console.log('Error running docker')
appendFileSync(outFilename, e.message)
} finally {
output.forEach((x: any) => {
appendFileSync(outFilename, x.stderr)
appendFileSync(outFilename, x.stdout)
})
try {
const { body } = await got(
`https://transfer.sh/${Math.random().toString(36).substring(2)}.txt`,
{
body: await readFileAsync(outFilename),
method: 'PUT',
}
)
console.log('Posted docker log: ', body)
} catch (e) {
console.log('Error posting log', e)
}
}
} }
+20 -30
View File
@@ -1,41 +1,31 @@
import { writeFileSync, readFileSync } from 'node:fs' import { writeFileSync, readFileSync } from 'fs'
import { equal } from 'node:assert' import { template } from 'lodash'
/** /**
* post build step to insert code files into code files (naively). * 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.
*/ */
const totalReplacements = 8 cp('src/fs/package.json', 'lib/fs/package.json')
let replaced = 0 cp('src/fs/bootstrap.js', 'lib/fs/bootstrap.js')
const mods = ['cjs', 'esm'] as const cp('src/fs/README.md', 'lib/fs/README.md')
mods.forEach((x) => { inject('lib/patches/third-party-main.js')
inject(x, `lib/${x}/patches/third-party-main.js`) inject('lib/steps/shim.js')
inject(x, `lib/${x}/steps/shim.js`) inject('lib/options.js', JSON.stringify(require('../package.json').version))
// eslint-disable-next-line @typescript-eslint/no-var-requires
inject(x, `lib/${x}/options.js`, JSON.stringify(require('../package.json').version))
})
function inject(mod: typeof mods[number], filename: string, ...replacements: string[]) { function inject(filename: string, 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
}
++replaced
console.log('Replacing: ', substring)
return replacements[+file]
? replacements[+file]
: JSON.stringify(readFileSync(file.replace('MOD', mod), 'utf8').replace('"use strict";', ''))
}) })
writeFileSync(filename, contents) writeFileSync(filename, contents)
console.log(`Wrote: ${filename}`) console.log(`Wrote: ${filename}`)
} }
equal(replaced, totalReplacements, `Expected to replace ${totalReplacements} things`) function cp(from: string, to: string) {
const file = readFileSync(from)
writeFileSync(to, file)
console.log('Copied: ', from, 'To: ', to)
}
+10
View File
@@ -0,0 +1,10 @@
{
"extends": "../tsconfig.json",
"compilerOptions": {
"noEmit": true
},
"include":[
"*.ts"
]
}
-15
View File
@@ -1,15 +0,0 @@
import * as nexeEsm from '../lib/esm/nexe.js'
import { createRequire } from 'node:module'
import { fileURLToPath } from 'node:url'
import { ok } from 'node:assert'
const cjs = createRequire(fileURLToPath(import.meta.url)),
nexeCjs = cjs('../lib/cjs/nexe.js'),
exports = ['NexeCompiler', 'argv', 'compile', 'help', 'version']
for (const exp of exports) {
ok(exp in nexeCjs)
ok(exp in nexeEsm)
}
console.log('esm and cjs modules match')
+18
View File
@@ -0,0 +1,18 @@
const { mkdtemp } = require('fs/promises')
const os = require('os')
const path = require('path')
const rimraf = require('rimraf')
async function runTests() {
const tempdir = await mkdtemp(path.join(os.tmpdir(), 'nexe-'))
process.on('beforeExit', () => rimraf.sync(tempdir))
process.chdir(tempdir)
const Mocha = require('mocha')
const mocha = new Mocha()
mocha.addFile('test/integration/tests.integration-spec.js')
mocha.run((failures) => {
process.exitCode = failures ? 1 : 0
})
}
runTests()
+112
View File
@@ -0,0 +1,112 @@
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', () => {
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())
})
})
+13 -14
View File
@@ -1,8 +1,7 @@
import { describe, it, expect } from 'vitest' import { normalizeOptions } from '../src/options'
import { expect } from 'chai'
import * as path from 'path' import * as path from 'path'
import { normalizeOptions } from '../src/options.js'
const ext = process.platform === 'win32' ? '.exe' : '' const ext = process.platform === 'win32' ? '.exe' : ''
describe('options', () => { describe('options', () => {
@@ -28,13 +27,13 @@ describe('options', () => {
expect(options.input).to.equal(path.resolve('./test/fixture/entry.js')) expect(options.input).to.equal(path.resolve('./test/fixture/entry.js'))
}) })
it('should resolve pathed options against cwd', () => { it('should resolve pathed options against cwd', () => {
const cwd = path.join(process.cwd(), 'test/fixture'), const cwd = path.join(process.cwd(), 'test/fixture')
options = normalizeOptions({ const options = normalizeOptions({
cwd, cwd,
input: 'entry', input: 'entry',
output: 'abc', output: 'abc',
temp: './d', temp: './d'
}) })
expect(options.temp).to.equal(path.resolve(cwd, './d')) expect(options.temp).to.equal(path.resolve(cwd, './d'))
expect(options.input).to.equal(path.resolve(cwd, 'entry.js')) expect(options.input).to.equal(path.resolve(cwd, 'entry.js'))
expect(options.output).to.equal(path.resolve(cwd, `abc${ext}`)) expect(options.output).to.equal(path.resolve(cwd, `abc${ext}`))
@@ -48,13 +47,13 @@ describe('options', () => {
}) })
it('should append trailing slash to third-party remote if necessary', () => { it('should append trailing slash to third-party remote if necessary', () => {
const options = normalizeOptions({ const options = normalizeOptions({
remote: 'https://sitejs.org/nexe', remote: 'https://sitejs.org/nexe'
}) })
expect(options.remote).to.equal('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', () => { it('should not append trailing slash to third-party remote that already has one', () => {
const options = normalizeOptions({ const options = normalizeOptions({
remote: 'https://sitejs.org/nexe/', remote: 'https://sitejs.org/nexe/'
}) })
expect(options.remote).to.equal('https://sitejs.org/nexe/') expect(options.remote).to.equal('https://sitejs.org/nexe/')
}) })
@@ -63,13 +62,13 @@ describe('options', () => {
describe('output', () => { describe('output', () => {
it('should work', () => { it('should work', () => {
const options = normalizeOptions({ const options = normalizeOptions({
output: './some-output', output: './some-output'
}) })
expect(options.output).to.equal(path.resolve(`./some-output${ext}`)) expect(options.output).to.equal(path.resolve(`./some-output${ext}`))
}) })
it('should default to the input file name if not index', () => { it('should default to the input file name if not index', () => {
const options = normalizeOptions({ const options = normalizeOptions({
input: './test/fixture', input: './test/fixture'
}) })
expect(options.output).to.equal(path.resolve(`./entry${ext}`)) expect(options.output).to.equal(path.resolve(`./entry${ext}`))
}) })
-1
View File
@@ -1 +0,0 @@
export {}
+6 -8
View File
@@ -1,11 +1,9 @@
import { describe, it, expect } from 'vitest' import { padRight, isWindows } from '../src/util'
import { expect } from 'chai'
import chalk from 'chalk' import chalk from 'chalk'
import { getTarget, NexeTarget } from '../src/target'
import { padRight } from '../src/util.js' const b = chalk.blue
import { getTarget } from '../src/target.js' const arch = process.arch === 'ia32' ? 'x86' : process.arch
const b = chalk.blue,
arch = process.arch === 'ia32' ? 'x86' : process.arch
describe('Targets', () => { describe('Targets', () => {
;[ ;[
@@ -18,7 +16,7 @@ describe('Targets', () => {
['static-x86-6.10.3', 'alpine-x86-6.10.3'], ['static-x86-6.10.3', 'alpine-x86-6.10.3'],
['linux-x32', `linux-x86-${process.version.slice(1)}`], ['linux-x32', `linux-x86-${process.version.slice(1)}`],
['alpine-notsupported-6.10.3', `alpine-${arch}-6.10.3`], ['alpine-notsupported-6.10.3', `alpine-${arch}-6.10.3`],
['not-a-thing', getTarget(process).toString()], ['not-a-thing', getTarget(process).toString()]
].forEach(([input, expected]) => { ].forEach(([input, expected]) => {
it(`should accept: ${padRight(JSON.stringify(input), 53)} ${b('->')} ${expected}`, () => { it(`should accept: ${padRight(JSON.stringify(input), 53)} ${b('->')} ${expected}`, () => {
expect(getTarget(input).toString()).to.equal(expected) expect(getTarget(input).toString()).to.equal(expected)
+7 -17
View File
@@ -1,25 +1,15 @@
{ {
"compilerOptions": { "compilerOptions": {
"outDir": "./lib/types", "target":"es2015",
"target":"es2020",
"lib": ["es2020"],
"module": "es2020",
"allowSyntheticDefaultImports": true,
"declaration": true,
"skipLibCheck": true, "skipLibCheck": true,
"moduleResolution": "node",
"experimentalDecorators": true, "experimentalDecorators": true,
"esModuleInterop": true,
"lib": ["es2018"],
"module": "commonjs",
"outDir": "./lib",
"strict": true "strict": true
}, },
"include":[ "include":[
"src/**/*.ts", "src/**/*.ts"
], ]
"ts-node": {
"transpileOnly": true,
"transpiler": "ts-node/transpilers/swc",
"compilerOptions": {
"esModuleInterop": true,
"module": "commonjs"
}
}
} }
+9
View File
@@ -0,0 +1,9 @@
{
"rulesDirectory": ["tslint-plugin-prettier", "tslint-config-prettier"],
"linterOptions": {
"exclude": ["**/node_modules/**/*"]
},
"rules": {
"prettier": [true, { "semi": false, "printWidth": 100, "singleQuote": true }]
}
}
+7
View File
@@ -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',
});