From 960f946928d0d1b02bdb358f7d69259f272ace84 Mon Sep 17 00:00:00 2001 From: tycrek Date: Sun, 3 Oct 2021 20:25:46 -0600 Subject: [PATCH 1/2] Fixed incorrect path check for custom index (cherry picked from ts branch) --- ass.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ass.js b/ass.js index 9a4af69..1908d04 100755 --- a/ass.js +++ b/ass.js @@ -66,7 +66,7 @@ useSsl && app.use(helmet.hsts({ preload: true })); // skipcq: JS-0093 app.use(nofavicon); // Use custom index, otherwise render README.md -const ASS_INDEX = indexFile !== '' && fs.existsSync(`./${indexFile}`) && require(`./${indexFile}`); +const ASS_INDEX = indexFile !== '' && fs.existsSync(path(`${indexFile}`)) && require(`./${indexFile}`); const ASS_INDEX_ENABLED = typeof ASS_INDEX === typeof Function; app.get('/', (req, res, next) => ASS_INDEX_ENABLED // skipcq: JS-0229 ? ASS_INDEX(req, res, next) From 33759fc7be86ebdc3e6d79cb6d3f007c65321543 Mon Sep 17 00:00:00 2001 From: tycrek Date: Sun, 3 Oct 2021 20:30:33 -0600 Subject: [PATCH 2/2] Custom index now loaded from `share/` --- .github/README.md | 6 +++--- ass.js | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/README.md b/.github/README.md index 4b6399c..0c04dd7 100644 --- a/.github/README.md +++ b/.github/README.md @@ -194,11 +194,11 @@ For HTTPS support, you must configure a reverse proxy. I recommend Caddy but any [Caddy]: https://caddyserver.com/ [my tutorial]: https://jmoore.dev/tutorials/2021/03/caddy-express-reverse-proxy/ -### Generating new tokens +## Generating new tokens If you need to generate a new token at any time, run `npm run new-token `. This will **automatically** load the new token so there is no need to restart ass. Username field is optional; if left blank, a random username will be created. -### Cloudflare users +## Cloudflare users In your Cloudflare DNS dashboard, set your domain/subdomain to **DNS Only** if you experience issues with **Proxied**. @@ -280,7 +280,7 @@ By default, ass directs the index route `/` to this README. Follow these steps t 1. Run `npm run setup` to re-run the setup script. - The defaults are set by your existing config, so you can press `Enter` to accept the defaults on most prompts. - The one setting you want to change is `Filename for your custom index`. Enter a name for your index, including `.js` (custom index's must be `.js` files). -2. Make a new file matching the name you entered. +2. Make a new file in the `share/` directory matching the name you entered (this directory can be found in the `ass/` directory. It is created automatically after setup is run). 3. Your index file needs to export a single function taking three arguments: `(req, res, next)`. Some code samples for common use cases are provided below. 4. Restart ass. The startup info logs should say **`Custom index:`**` enabled`. diff --git a/ass.js b/ass.js index 1908d04..6eb8e6e 100755 --- a/ass.js +++ b/ass.js @@ -66,7 +66,7 @@ useSsl && app.use(helmet.hsts({ preload: true })); // skipcq: JS-0093 app.use(nofavicon); // Use custom index, otherwise render README.md -const ASS_INDEX = indexFile !== '' && fs.existsSync(path(`${indexFile}`)) && require(`./${indexFile}`); +const ASS_INDEX = indexFile !== '' && fs.existsSync(path('share', indexFile)) && require(`./share/${indexFile}`); const ASS_INDEX_ENABLED = typeof ASS_INDEX === typeof Function; app.get('/', (req, res, next) => ASS_INDEX_ENABLED // skipcq: JS-0229 ? ASS_INDEX(req, res, next)