Compare commits
No commits in common. "648c72fa34c451bcf088d914b474a11875154b6b" and "9a4f621f6987b76aa8ad5e0d093372718ecdf925" have entirely different histories.
648c72fa34
...
9a4f621f69
18
app.js
18
app.js
|
@ -82,17 +82,17 @@ app.use("/api/v2/user", user2Rtr); // API Version 2
|
|||
app.use("/misc", miscRtr); // Non public-api endpoints (Stats, Issue, etc.)
|
||||
|
||||
// Unauthenticated Routes
|
||||
//app.use("/api/v1/list", listRtr); - Remove v1 List API - list.routes
|
||||
//app.use("/api/v1/ldb", ldbRtr); - Remove v1 LDB API
|
||||
//app.use("/api/v1/kube", kubeRtr); - Remove v1 Kube API
|
||||
//app.use("/api/v1/find", findRtr); - Remove v1 Find API
|
||||
//app.use("/api/v1/issue", issueRtr); - Remove v1 Issue API
|
||||
//app.use("/api/v1/stats", statRtr); - Remove v1 Stats API
|
||||
//app.use("/api/v1/register", regRtr); - Remove v1 Register API
|
||||
app.use("/api/v1/list", listRtr);
|
||||
app.use("/api/v1/ldb", ldbRtr);
|
||||
app.use("/api/v1/kube", kubeRtr);
|
||||
app.use("/api/v1/find", findRtr);
|
||||
app.use("/api/v1/issue", issueRtr);
|
||||
app.use("/api/v1/stats", statRtr);
|
||||
app.use("/api/v1/register", regRtr);
|
||||
|
||||
// Authented Routes
|
||||
//app.use("/api/v1/ldbs", authenticate, ldbsRtr); - Remove v1 LDBS API
|
||||
//app.use("/api/v1/pis", authenticate, pisRtr); - Remove v1 PIS API
|
||||
app.use("/api/v1/ldbs", authenticate, ldbsRtr);
|
||||
app.use("/api/v1/pis", authenticate, pisRtr);
|
||||
app.use("/api/v1/auth/test", authenticate, (req, res) =>
|
||||
res.status(200).json({
|
||||
status: "ok",
|
||||
|
|
|
@ -9,6 +9,7 @@
|
|||
"version": "1.2.0-dev",
|
||||
"license": "GPL-3.0-or-later",
|
||||
"dependencies": {
|
||||
"axios": "^1.2.1",
|
||||
"compression": "^1.7.4",
|
||||
"cors": "^2.8.5",
|
||||
"express": "^4.18.2",
|
||||
|
@ -2862,6 +2863,11 @@
|
|||
"resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
|
||||
"integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg=="
|
||||
},
|
||||
"node_modules/asynckit": {
|
||||
"version": "0.4.0",
|
||||
"resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
|
||||
"integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="
|
||||
},
|
||||
"node_modules/atomic-sleep": {
|
||||
"version": "1.0.0",
|
||||
"resolved": "https://registry.npmjs.org/atomic-sleep/-/atomic-sleep-1.0.0.tgz",
|
||||
|
@ -2870,6 +2876,16 @@
|
|||
"node": ">=8.0.0"
|
||||
}
|
||||
},
|
||||
"node_modules/axios": {
|
||||
"version": "1.5.0",
|
||||
"resolved": "https://registry.npmjs.org/axios/-/axios-1.5.0.tgz",
|
||||
"integrity": "sha512-D4DdjDo5CY50Qms0qGQTTw6Q44jl7zRwY7bthds06pUGfChBCTcQs+N743eFWGEd6pRTMd6A+I87aWyFV5wiZQ==",
|
||||
"dependencies": {
|
||||
"follow-redirects": "^1.15.0",
|
||||
"form-data": "^4.0.0",
|
||||
"proxy-from-env": "^1.1.0"
|
||||
}
|
||||
},
|
||||
"node_modules/babel-jest": {
|
||||
"version": "29.7.0",
|
||||
"resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-29.7.0.tgz",
|
||||
|
@ -3375,6 +3391,17 @@
|
|||
"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
|
||||
"dev": true
|
||||
},
|
||||
"node_modules/combined-stream": {
|
||||
"version": "1.0.8",
|
||||
"resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
|
||||
"integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
|
||||
"dependencies": {
|
||||
"delayed-stream": "~1.0.0"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">= 0.8"
|
||||
}
|
||||
},
|
||||
"node_modules/commander": {
|
||||
"version": "2.20.3",
|
||||
"resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
|
||||
|
@ -3581,6 +3608,14 @@
|
|||
"node": ">=0.10.0"
|
||||
}
|
||||
},
|
||||
"node_modules/delayed-stream": {
|
||||
"version": "1.0.0",
|
||||
"resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
|
||||
"integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
|
||||
"engines": {
|
||||
"node": ">=0.4.0"
|
||||
}
|
||||
},
|
||||
"node_modules/depd": {
|
||||
"version": "2.0.0",
|
||||
"resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
|
||||
|
@ -4236,6 +4271,38 @@
|
|||
"integrity": "sha512-36yxDn5H7OFZQla0/jFJmbIKTdZAQHngCedGxiMmpNfEZM0sdEeT+WczLQrjK6D7o2aiyLYDnkw0R3JK0Qv1RQ==",
|
||||
"dev": true
|
||||
},
|
||||
"node_modules/follow-redirects": {
|
||||
"version": "1.15.2",
|
||||
"resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz",
|
||||
"integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==",
|
||||
"funding": [
|
||||
{
|
||||
"type": "individual",
|
||||
"url": "https://github.com/sponsors/RubenVerborgh"
|
||||
}
|
||||
],
|
||||
"engines": {
|
||||
"node": ">=4.0"
|
||||
},
|
||||
"peerDependenciesMeta": {
|
||||
"debug": {
|
||||
"optional": true
|
||||
}
|
||||
}
|
||||
},
|
||||
"node_modules/form-data": {
|
||||
"version": "4.0.0",
|
||||
"resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
|
||||
"integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
|
||||
"dependencies": {
|
||||
"asynckit": "^0.4.0",
|
||||
"combined-stream": "^1.0.8",
|
||||
"mime-types": "^2.1.12"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">= 6"
|
||||
}
|
||||
},
|
||||
"node_modules/forwarded": {
|
||||
"version": "0.2.0",
|
||||
"resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
|
||||
|
@ -6388,6 +6455,11 @@
|
|||
"node": ">= 0.10"
|
||||
}
|
||||
},
|
||||
"node_modules/proxy-from-env": {
|
||||
"version": "1.1.0",
|
||||
"resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
|
||||
"integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg=="
|
||||
},
|
||||
"node_modules/punycode": {
|
||||
"version": "2.3.0",
|
||||
"resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz",
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
},
|
||||
"license": "GPL-3.0-or-later",
|
||||
"author": "Fred Boniface",
|
||||
"main": "app.js",
|
||||
"main": "express.js",
|
||||
"scripts": {
|
||||
"build": "tsc",
|
||||
"run": "tsc && node dist/app.js",
|
||||
|
@ -17,6 +17,7 @@
|
|||
"format": "npx prettier -w ."
|
||||
},
|
||||
"dependencies": {
|
||||
"axios": "^1.2.1",
|
||||
"compression": "^1.7.4",
|
||||
"cors": "^2.8.5",
|
||||
"express": "^4.18.2",
|
||||
|
|
|
@ -0,0 +1,8 @@
|
|||
const express = require("express");
|
||||
const router = express.Router();
|
||||
|
||||
// Controller Imports
|
||||
|
||||
// Routes
|
||||
|
||||
module.exports = router;
|
|
@ -0,0 +1,28 @@
|
|||
const express = require("express");
|
||||
const router = express.Router();
|
||||
|
||||
/* Controller Imports */
|
||||
|
||||
// Live
|
||||
|
||||
// Timetable
|
||||
|
||||
// Ref
|
||||
|
||||
// User
|
||||
|
||||
/* Routes */
|
||||
|
||||
// Live
|
||||
router.get("/live/station/:id/:type");
|
||||
router.get("/live/train/:searchType/:id");
|
||||
|
||||
// Timetable
|
||||
router.get("/timetable/train/:date/:searchType/:id");
|
||||
|
||||
// User
|
||||
router.post("/user");
|
||||
router.get("/user/:uuid");
|
||||
router.delete("/user/:uuid");
|
||||
|
||||
module.exports = router;
|
|
@ -1,6 +1,6 @@
|
|||
/* eslint-disable no-useless-escape */
|
||||
//const axios = require("axios");
|
||||
import { logger } from "../utils/logger.utils";
|
||||
const axios = require("axios");
|
||||
const log = require("../utils/logs.utils");
|
||||
|
||||
const issueLabels = {
|
||||
bug: 120,
|
||||
|
@ -11,7 +11,7 @@ const issueLabels = {
|
|||
};
|
||||
|
||||
async function processor(data) {
|
||||
logger.debug("issueService.processor: Issue received");
|
||||
log.out("issueService.processor: Issue received", "info");
|
||||
let out = {};
|
||||
out.labels = [issueLabels[data?.label] || 0, issueLabels["web-user"]];
|
||||
out.title = data?.subject.replace(/<[^>]+>|[\*\$]/g, "");
|
||||
|
@ -26,17 +26,15 @@ async function sendToGitea(body) {
|
|||
headers: {
|
||||
Authorization: key,
|
||||
},
|
||||
body: body,
|
||||
};
|
||||
//var res = await axios.post(url, body, opts);
|
||||
const res = await fetch(url, opts);
|
||||
var res = await axios.post(url, body, opts);
|
||||
/* Need to read the output from the POST and pass the result upwards to the
|
||||
client.*/
|
||||
if (res.status == 201) {
|
||||
logger.info("issueService.sendToGitea: Issue sent to Gitea");
|
||||
log.out("issueService.sendToGitea: Issue sent to Gitea", "info");
|
||||
return { status: res.status, message: "issue created" };
|
||||
} else {
|
||||
logger.error(res.body, "issueService.sendToGitea: Fail to send issue");
|
||||
log.out(`issueService.sendToGitea: Fail to send issue: ${res.body}`, "err");
|
||||
return { status: res.status, message: "issue not created" };
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,14 +1,13 @@
|
|||
const testing = require("../services/mail.services");
|
||||
|
||||
import { logger } from "../utils/logger.utils";
|
||||
const log = require("../utils/logs.utils");
|
||||
|
||||
async function getAlive() {
|
||||
logger.trace("kubeServices.getAlive: alive hook checked")
|
||||
log.out("kubeServices.getAlive: alive hook checked", "info");
|
||||
return { code: 200, state: { state: "alive", noise: "twit-twoo" } };
|
||||
}
|
||||
|
||||
async function getReady() {
|
||||
logger.trace("kubeServices.getReady: ready hook checked");
|
||||
log.out("kubeServices.getReady: ready hook checked", "info");
|
||||
testing.send({
|
||||
to: "fred@fjla.uk",
|
||||
subject: "OwlBoard Test",
|
||||
|
|
|
@ -1,16 +1,15 @@
|
|||
const log = require("../utils/logs.utils"); // Log Helper
|
||||
const db = require("../services/dbAccess.services");
|
||||
|
||||
import { logger } from "../utils/logger.utils";
|
||||
|
||||
async function getStations() {
|
||||
var out = db.query("stations");
|
||||
logger.debug("listServices.getStations: Fetching stations list");
|
||||
log.out("listServices.getStations: Fetching stations list", "info");
|
||||
return await out;
|
||||
}
|
||||
|
||||
async function getCorpus() {
|
||||
var out = db.query("corpus");
|
||||
logger.debug("listServices.getCorpus: Fetching CORPUS list");
|
||||
log.out("listServices.getCorpus: Fetching CORPUS list", "info");
|
||||
return await out;
|
||||
}
|
||||
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
const mail = require("nodemailer");
|
||||
import { logger } from "../utils/logger.utils";
|
||||
const log = require("../utils/logs.utils");
|
||||
const mail = require("nodemailer"); //>> Probs wrong
|
||||
|
||||
const fromAddr = process.env.OWL_EML_FROM;
|
||||
const smtpUser = process.env.OWL_EML_USER;
|
||||
|
@ -20,15 +20,15 @@ let transporter = mail.createTransport({
|
|||
/* 'message' is an object containing string values for:
|
||||
*to, cc, bcc, *subject, *txt, html. * denotes required */
|
||||
async function send(message) {
|
||||
logger.debug("mailServices.send: Message send request received");
|
||||
log.out("mailServices.send: Message send request received", "info");
|
||||
message.from = fromAddr;
|
||||
try {
|
||||
var res = await transporter.sendMail(message);
|
||||
} catch (err) {
|
||||
logger.error(err, "mailServices.send: Message send failed");
|
||||
log.out(`mailServices.send: Message send failed: ${err}`, "err");
|
||||
return false;
|
||||
}
|
||||
logger.debug(res.response, "mailServices.send: SMTP Response");
|
||||
log.out(`mailServices.send: SMTP Response: ${res.response}`);
|
||||
return true;
|
||||
}
|
||||
|
||||
|
|
|
@ -1,14 +1,17 @@
|
|||
// Finds PIS Codes using DB Lookups
|
||||
|
||||
const db = require("../services/dbAccess.services");
|
||||
const log = require("../utils/logs.utils");
|
||||
const clean = require("../utils/sanitizer.utils");
|
||||
|
||||
import { logger } from "../utils/logger.utils";
|
||||
|
||||
const supported = ["GW", "UK"];
|
||||
|
||||
async function findPisByOrigDest(start, end) {
|
||||
logger.debug(`pisServices.findPisByOrigDest: Searching for Orig: ${start}, Dest: ${end}`);
|
||||
log.out(
|
||||
"pisServices.findPisByOrigDest: Searching for PIS for Orig: " +
|
||||
`${start}, Dest: ${end}`,
|
||||
"dbug"
|
||||
);
|
||||
const firstCrs = clean.cleanApiEndpointTxt(start.toLowerCase());
|
||||
const lastCrs = clean.cleanApiEndpointTxt(end.toLowerCase());
|
||||
const query = {
|
||||
|
@ -30,7 +33,7 @@ async function findPisByOrigDest(start, end) {
|
|||
}
|
||||
|
||||
async function findPisByCode(code) {
|
||||
logger.debug(`pisServices.findPisByCode: Searching for PIS code: ${code}`);
|
||||
log.out(`pisServices.findPisByCode: Searching for PIS code: ${code}`, "dbug");
|
||||
const cleanCode = clean.removeNonNumeric(code);
|
||||
const query = {
|
||||
code: parseInt(cleanCode),
|
||||
|
|
Loading…
Reference in New Issue