zefie/minisrv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wtv-news goodies

Browse Source
This commit is contained in:
zefie
2022-10-11 21:44:18 -04:00
parent c09824fd6c
commit f48da37f22
15 changed files with 460 additions and 197 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
zefie_wtvp_minisrv/includes/WTVClientSessionData.js
View File

@@ -427,7 +427,7 @@ class WTVClientSessionData {
}
generatePassword(len) {
return CryptoJS.lib.WordArray.random(Math.round(len / 2)).toString(CryptoJS.enc.Hex);
return this.wtvshared.generatePassword(len);
}
setUserPassword(passwd) {

256
zefie_wtvp_minisrv/includes/WTVNews.js
View File

@@ -2,12 +2,16 @@ class WTVNews {
minisrv_config = null;
newsie = require('newsie').default;
strftime = require('strftime');
wtvshared = null;
service_name = null;
client = null;
constructor(minisrv_config, service_name) {
this.minisrv_config = minisrv_config;
this.service_name = service_name;
const { WTVShared } = require("./WTVShared.js");
this.wtvshared = new WTVShared(minisrv_config);
this.client = new this.newsie({
host: this.minisrv_config.services[service_name].upstream_address,
port: this.minisrv_config.services[service_name].upstream_port
@@ -27,13 +31,24 @@ class WTVNews {
});
}
listGroup(group) {
listGroup(group, page = 0, limit = 100) {
return new Promise((resolve, reject) => {
this.client.listGroup(group).then((data) => {
resolve(data);
this.selectGroup(group).then((res) => {
var range = {
start: (limit * page) + res.group.low,
}
range.end = range.start + limit;
if (page) range.start++;
if (range.end > res.high) delete range.group.end;
console.log(res, range);
this.client.listGroup(group, range).then((data) => {
resolve(data);
}).catch((e) => {
console.error(" * WTVNews Error:", "Command: listGroup", e);
reject(`No such group <b>${group}</b>`);
});
}).catch((e) => {
console.error(" * WTVNews Error:", "Command: listGroup", e);
reject(`No such group <b>${group}</b>`);
console.error(" * WTVNews Error:", "Command: selectGroup", e);
});
})
}
@@ -41,7 +56,7 @@ class WTVNews {
selectGroup(group) {
return new Promise((resolve, reject) => {
this.client.group(group).then((response) => {
if (response.code == 211) resolve(true);
if (response.code == 211) resolve(response);
else reject(`No such group <b>${group}</b>`);
}).catch((e) => {
console.error(" * WTVNews Error:", "Command: selectGroup", e);
@@ -51,12 +66,50 @@ class WTVNews {
}
getArticle(articleID) {
var articleID = parseInt(articleID);
return new Promise((resolve, reject) => {
var promises = [];
this.client.article(articleID).then((data) => {
resolve(data)
// ask server for next article
promises.push(new Promise((resolve, reject) => {
this.client.next().then((res) => {
data.next_article = res.article.articleNumber;
resolve(data.next_article);
}).catch(() => {
data.next_article = null;
resolve(data.next_article);
})
}));
// ask server for previous article
promises.push(new Promise((resolve, reject) => {
this.client.last().then((res) => {
data.prev_article = res.article.articleNumber;
// do it again
this.client.article(data.prev_article).then(() => {
this.client.last().then((res) => {
data.prev_article = res.article.articleNumber;
resolve(data.prev_article);
}).catch(() => {
data.prev_article = null;
resolve(data.prev_article);
});
}).catch(() => {
data.prev_article = null;
resolve(data.prev_article);
});
}).catch(() => {
data.prev_article = null;
resolve(data.prev_article);
})
}));
Promise.all(promises).then(() => {
resolve(data);
});
}).catch((e) => {
reject(`Error reading article ID ${articleID}`);
console.error(" * WTVNews Error:", "Command: article", e);
console.error(" * WTVNews Error:", "Command: article", "args:", articleID, "Error:", e);
});
});
}
@@ -87,24 +140,193 @@ class WTVNews {
});
}
postToGroup(group, from_addr, msg_subject, msg_body, article = null) {
return new Promise((resolve, reject) => {
var promises = [];
var messageid = null;
this.connectUsenet()
.then(() => {
if (article) {
promises.push(new Promise((resolve, reject) => {
this.selectGroup(group).then((res) => {
this.getArticleMessageID(article).then((data) => {
console.log(data);
messageid = data;
resolve(data);
}).catch((e) => {
console.log(e);
reject(e)
});
}).catch((e) => {
console.log(e);
reject(e)
});
}));
}
Promise.all(promises).then(() => {
this.client.post()
.then((response) => {
if (response.code == 340) {
var articleData = {};
articleData.headers = {
'Relay-Version': "version zefie_wtvp_minisrv " + this.minisrv_config.version + "; site " + this.minisrv_config.config.domain_name,
'Posting-Version': "version zefie_wtvp_minisrv " + this.minisrv_config.version + "; site " + this.minisrv_config.config.domain_name,
'Path': "@" + this.minisrv_config.config.domain_name,
'From': from_addr,
'Newsgroups': group,
'Subject': msg_subject || "(No subject)",
'Message-ID': "<" + this.wtvshared.generatePassword(16) + "@" + this.minisrv_config.config.domain_name + ">",
'Date': this.strftime('%A, %d-%b-%y %k:%M:%S %z', new Date())
}
if (messageid) articleData.headers.References = messageid;
if (msg_body) {
articleData.body = msg_body.split("\n");
} else {
articleData.body = [];
}
console.log(articleData);
response.send(articleData).then((response) => {
this.client.quit();
if (response.code !== 240) {
reject("Could not send post. Server returned error " + response.code);
} else {
resolve(true);
}
}).catch((e) => {
this.client.quit();
reject("Could not send post. Server returned error " + response.code);
});
}
else {
this.client.quit();
console.log('usenet upstream uncaught error', e);
reject("Could not send post. Server returned unknown error");
};
}).catch((e) => {
console.log('could not connect to server', e);
reject("could not connect to server");
});
});
});
});
}
getArticleMessageID(articleID) {
return new Promise((resolve, reject) => {
this.client.article(articleID).then((data) => {
resolve(data.article.messageId);
}).catch((e) => {
reject(e);
});
});
}
getHeaderObj(NGArticles) {
return new Promise((resolve, reject) => {
var messages = [];
var failed = false;
var promises = [];
for (var article in NGArticles) {
if (failed) continue;
if (article == "getCaseInsensitiveKey") continue;
this.getHeader(NGArticles[article]).then((data) => {
if (data.article) messages.push(data.article)
promises.push(new Promise((resolve, reject) => {
this.getHeader(NGArticles[article]).then((data) => {
if (data.article) messages.push(data.article)
resolve();
}).catch((e) => {
console.log(e, article);
reject(e);
});
}));
}
if (promises.length > 0) {
Promise.all(promises).then(() => {
if (messages.length > 0) resolve(messages);
}).catch((e) => {
console.log(e, article);
failed = e;
reject("Could not read message list", e);
});
} else {
resolve(messages);
}
});
}
sortByResponse(messages) {
var sorted = [];
var message_id_roots = [];
var message_relations = [];
Object.keys(messages).forEach((k) => {
var messageId = messages[k].messageId;
var ref = messages[k].headers.REFERENCES;
if (ref) {
var res = message_id_roots.find(e => e.messageId == ref);
if (res) {
// see if its attached to a root post
if (message_relations[res.messageId]) message_relations[res.messageId].push({ "messageId": messageId, "index": k });
else message_relations[res.messageId] = [{ "messageId": messageId, "index": k }];
} else {
// see if its related to a relation
if (Object.keys(message_relations).length > 0) {
var found = false;
Object.keys(message_relations).forEach((j) => {
if (message_relations[j].length > 0) {
Object.keys(message_relations[j]).forEach((h) => {
if (found) return;
if (message_relations[j][h].messageId == ref) {
var searchref = messages[message_relations[j][h].index].headers.REFERENCES || null;
var mainref = null;
while (searchref !== null) {
var searchart = messages.find(e => e.messageId == searchref);
var searchref = searchart.headers.REFERENCES || null;
}
mainref = searchart.messageId;
message_relations[mainref].push({ "messageId": messageId, "index": k });
found = true;
}
});
}
})
if (!found) {
message_id_roots.push({ "messageId": messageId, "index": j });
}
} else {
message_id_roots.push({ "messageId": messageId, "index": k });
}
}
}
else {
message_id_roots.push({ "messageId": messageId, "index": k });
}
});
// sort the relations, putting root articles first, followed by their relations
var message_roots_sorted = [];
Object.keys(message_id_roots).forEach((k) => {
// sort relations by date
var article = messages[message_id_roots[k].index];
var article_date = Date.parse(article.headers.DATE);
message_roots_sorted.push({ "article": article, "relation": null, "date": article_date });
});
message_roots_sorted.sort((a, b) => { return (a.date > b.date) });
Object.keys(message_roots_sorted).forEach((k) => {
sorted.push(message_roots_sorted[k]);
if (message_relations[message_id_roots[k].messageId]) {
var relations = [];
Object.keys(message_relations[message_id_roots[k].messageId]).forEach((j) => {
// sort relations by date
var article = messages[message_relations[message_id_roots[k].messageId][j].index];
var article_date = Date.parse(article.headers.DATE);
relations.push({ "article": article, "relation": message_id_roots[k].messageId, "date": article_date })
});
relations.sort((a, b) => { return (a.date > b.date) });
Object.keys(relations).forEach((j) => {
sorted.push(relations[j]);
});
}
if (!failed) resolve(messages);
else reject("Could not read message list", failed);
});
})
return sorted;
}
}
module.exports = WTVNews;

11
zefie_wtvp_minisrv/includes/WTVShared.js
View File

@@ -1,7 +1,7 @@
/**
* Shared functions across all classes and apps
*/
const CryptoJS = require('crypto-js');
class WTVShared {
@@ -9,7 +9,6 @@ class WTVShared {
fs = require('fs');
v8 = require('v8');
zlib = require('zlib');
CryptoJS = require('crypto-js');
html_entities = require('html-entities'); // used externally by service scripts
sanitizeHtml = require('sanitize-html');
iconv = require('iconv-lite');
@@ -310,6 +309,10 @@ class WTVShared {
}
}
generatePassword(len) {
return CryptoJS.lib.WordArray.random(Math.round(len / 2)).toString(CryptoJS.enc.Hex);
}
getMiniSrvConfig() {
return this.minisrv_config;
}
@@ -435,7 +438,7 @@ class WTVShared {
var post_obj = {};
post_obj.query = [];
try {
var post_text = obj.post_data.toString(this.CryptoJS.enc.Utf8);
var post_text = obj.post_data.toString(CryptoJS.enc.Utf8);
if (post_text.length > 0) {
post_text = post_text.split("&");
for (let i = 0; i < post_text.length; i++) {
@@ -454,7 +457,7 @@ class WTVShared {
post_text = post_text.substring(0, post_text.length - 1);
obj.post_data = post_text.hexEncode();
} catch (e) {
obj.post_data = obj.post_data.toString(this.CryptoJS.enc.Hex);
obj.post_data = obj.post_data.toString(CryptoJS.enc.Hex);
}
} else {
// simple, no filter

5
zefie_wtvp_minisrv/includes/config.json
View File

@@ -126,7 +126,10 @@
},
"wtv-mail": {
"port": 1608,
"connections": 3
"connections": 3,
"modules": [
"WTVNews"
]
},
"wtv-passport": {
"port": 1654