Skip to content

node 24 compatibility and update vulnerable packages #40

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vlinder wants to merge 2 commits into
base: main
Choose a base branch
from
Open

node 24 compatibility and update vulnerable packages #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c1f387f
update vulnerable packages
vlinder Apr 29, 2026
5ccc771
update ssh2 package to support node v24
vlinder Apr 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 29 additions & 8 deletions lib/base/novacom.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@
const async = require('async'),
chalk = require('chalk'),
fs = require('fs'),
http = require('http'),
mkdirp = require('mkdirp'),
net = require('net'),
log = require('npmlog'),
path = require('path'),
request = require('request'),
shelljs = require('shelljs'),
Ssh2 = require('ssh2'),
stream = require('stream'),
Expand Down Expand Up @@ -367,24 +367,45 @@ const async = require('async'),
this.getDeviceBy.bind(this, 'name', name),
function(targetDevice, next) {
log.info("Resolver#getSshPrvKey()", "targetDevice.host:", targetDevice.host);
const url = 'http://' + targetDevice.host + ':9991' + '/webos_rsa';
const urlStr = 'http://' + targetDevice.host + ':9991/webos_rsa';
const keyFileNamePrefix = targetDevice.name.replace(/(\s+)/gi, '_');
const keyFileName = keyFileNamePrefix + "_webos";
const keySavePath = path.join(keydir, keyFileName);
request.head(url, function(err, res) {
if (err || (res && res.statusCode !== 200)) {
const url = new URL(urlStr);
const headOpts = { hostname: url.hostname, port: url.port, path: url.pathname, method: 'HEAD' };
const headReq = http.request(headOpts, function(res) {
res.resume();
if (res.statusCode !== 200) {
return setImmediate(next, errHndl.getErrMsg("FAILED_GET_SSHKEY"));
}
log.info("Resolver#getSshPrvKey()#head", "content-type:", res.headers['content-type']);
log.info("Resolver#getSshPrvKey()#head", "content-length:", res.headers['content-length']);
request(url).pipe(fs.createWriteStream(keySavePath)).on('close', function(error) {
if (error) {
const writeStream = fs.createWriteStream(keySavePath);
http.get(urlStr, function(getRes) {
if (getRes.statusCode !== 200) {
writeStream.close();
fs.unlink(keySavePath, function() {});
return setImmediate(next, errHndl.getErrMsg("FAILED_GET_SSHKEY"));
} else {
setImmediate(next, error, keySavePath, keyFileName);
}
getRes.pipe(writeStream);
writeStream.on('finish', function() {
writeStream.close(function(error) {
if (error) {
return setImmediate(next, errHndl.getErrMsg("FAILED_GET_SSHKEY"));
}
setImmediate(next, null, keySavePath, keyFileName);
});
});
}).on('error', function(err) {
writeStream.close();
fs.unlink(keySavePath, function() {});
setImmediate(next, errHndl.getErrMsg("FAILED_GET_SSHKEY"));
});
});
headReq.on('error', function(err) {
setImmediate(next, errHndl.getErrMsg("FAILED_GET_SSHKEY"));
});
headReq.end();
},
function(keyFilePath, keyFileName, next) {
log.info("Resolver#getSshPrvKey()", "SSH Private Key:", keyFilePath);
Expand Down
47 changes: 31 additions & 16 deletions lib/inspect.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
*/

const async = require('async'),
http = require('http'),
npmlog = require('npmlog'),
path = require('path'),
request = require('request'),
util = require('util'),
installer = require('./install'),
launcher = require('./launch'),
Expand Down Expand Up @@ -238,10 +238,11 @@ let platformNodeVersion = "0";
nodeInsptUrl = util.format(urlFormat, ip, nodeInsptPort, nodeDebugPort);
let killTimer;

request.get(nodeInsptUrl, function(error, response) {
if (!error && response.statusCode === 200) {
const req = http.get(nodeInsptUrl, function(response) {
if (response.statusCode === 200) {
server.runServer(__dirname, 0, _reqHandler, _postAction);
}
response.resume();

function _reqHandler(code, res) {
if (code === "@@ARES_CLOSE@@") {
Expand All @@ -265,6 +266,7 @@ let platformNodeVersion = "0";
next();
}
});
req.on('error', function() {});
};

async.waterfall([
Expand Down Expand Up @@ -408,23 +410,36 @@ let platformNodeVersion = "0";
return next();
}

request.get(url + listFile.reqPath, function(error, response, body) {
if (error || response.statusCode !== 200) {
const requestUrl = url + listFile.reqPath;
const req = http.get(requestUrl, function(res) {
if (res.statusCode !== 200) {
return next();
}
const pagelist = JSON.parse(body);
for (const index in pagelist) {
if (pagelist[index].url.indexOf(options.appId) !== -1 ||
pagelist[index].url.indexOf(options.localIP) !== -1) {
if (!pagelist[index][listFile.propName]) {
return next(errHndl.getErrMsg("USING_WEBINSPECTOR"));
const chunks = [];
res.on('data', function(chunk) { chunks.push(chunk); });
res.on('end', function() {
try {
const body = Buffer.concat(chunks).toString('utf8');
const pagelist = JSON.parse(body);
for (const index in pagelist) {
if (pagelist[index].url.indexOf(options.appId) !== -1 ||
pagelist[index].url.indexOf(options.localIP) !== -1) {
if (!pagelist[index][listFile.propName]) {
return next(errHndl.getErrMsg("USING_WEBINSPECTOR"));
}
url += pagelist[index][listFile.propName];
listFiles = [];
break;
}
}
url += pagelist[index][listFile.propName];
listFiles = [];
break;
next(null, listFiles);
} catch (e) {
next();
}
}
next(null, listFiles);
});
});
req.on('error', function() {
next();
});
}

Expand Down
Loading