Skip to content

Commit b1e06ab

Browse files
committed
Fix to Readdirp handling after migration to v.4.0
Fix to Readdirp handling after migration to v4.0: - let {readdirp} = require('readdirp'); - var localfiles = await new Promise((resolve, reject) => { ... } Workflows added Signed-off-by: Milosz Linkiewicz <[email protected]>
1 parent ebc001a commit b1e06ab

File tree

2 files changed

+9
-13
lines changed

2 files changed

+9
-13
lines changed

app.js

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ var http = require('http').Server(app);
1515
var io = require('socket.io')(http, {path: baseurl + 'socket.io'});
1616
var isBinaryFile = require("isbinaryfile").isBinaryFile;
1717
var path = require('path');
18-
var readdirp = require('readdirp');
18+
let {readdirp} = require('readdirp');
1919
var fetch = require('node-fetch');
2020
var si = require('systeminformation');
2121
const util = require('util');
@@ -182,7 +182,14 @@ io.on('connection', function(socket){
182182
var remotemenuversion = fs.readFileSync('/config/menuversion.txt', 'utf8');
183183
var endpointsfile = fs.readFileSync('/config/endpoints.yml');
184184
var endpoints = yaml.load(endpointsfile);
185-
var localfiles = await readdirp.promise('/assets/.');
185+
// Wrap readdirp in a promise
186+
var localfiles = await new Promise((resolve, reject) => {
187+
const entries = [];
188+
readdirp('/assets/.')
189+
.on('data', (entry) => entries.push(entry))
190+
.on('end', () => resolve(entries))
191+
.on('error', (error) => reject(error));
192+
});
186193
var assets = [];
187194
if (localfiles.length != 0){
188195
for (var i in localfiles){

root/defaults/default

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,6 @@ server {
22
listen ${NGINX_PORT};
33
location / {
44
root /assets;
5-
try_files $uri $uri/ @github;
65
autoindex on;
76
}
8-
9-
location @github {
10-
rewrite ^ /netbootxyz$uri break;
11-
12-
proxy_buffer_size 128k;
13-
proxy_buffers 4 256k;
14-
proxy_busy_buffers_size 256k;
15-
16-
proxy_pass https://github.com;
17-
}
187
}

0 commit comments

Comments
 (0)