aboutsummaryrefslogtreecommitdiff
path: root/src/server/ApiManagers
diff options
context:
space:
mode:
Diffstat (limited to 'src/server/ApiManagers')
-rw-r--r--src/server/ApiManagers/DownloadManager.ts3
-rw-r--r--src/server/ApiManagers/GeneralGoogleManager.ts17
-rw-r--r--src/server/ApiManagers/GooglePhotosManager.ts4
-rw-r--r--src/server/ApiManagers/PDFManager.ts12
-rw-r--r--src/server/ApiManagers/SearchManager.ts12
-rw-r--r--src/server/ApiManagers/UploadManager.ts16
-rw-r--r--src/server/ApiManagers/UtilManager.ts8
7 files changed, 37 insertions, 35 deletions
diff --git a/src/server/ApiManagers/DownloadManager.ts b/src/server/ApiManagers/DownloadManager.ts
index 5bad46eda..2280739fc 100644
--- a/src/server/ApiManagers/DownloadManager.ts
+++ b/src/server/ApiManagers/DownloadManager.ts
@@ -57,14 +57,13 @@ export default class DownloadManager extends ApiManager {
register({
method: Method.GET,
- subscription: new RouteSubscriber("/serializeDoc").add("docId"),
+ subscription: new RouteSubscriber("serializeDoc").add("docId"),
onValidation: async ({ req, res }) => {
const { docs, files } = await getDocs(req.params.docId);
res.send({ docs, files: Array.from(files) });
}
});
-
}
}
diff --git a/src/server/ApiManagers/GeneralGoogleManager.ts b/src/server/ApiManagers/GeneralGoogleManager.ts
index 629684e0c..3617779d5 100644
--- a/src/server/ApiManagers/GeneralGoogleManager.ts
+++ b/src/server/ApiManagers/GeneralGoogleManager.ts
@@ -38,16 +38,19 @@ export default class GeneralGoogleManager extends ApiManager {
register({
method: Method.POST,
- subscription: new RouteSubscriber("/googleDocs").add("sector", "action"),
+ subscription: new RouteSubscriber("googleDocs").add("sector", "action"),
onValidation: async ({ req, res, user }) => {
- let sector: GoogleApiServerUtils.Service = req.params.sector as GoogleApiServerUtils.Service;
- let action: GoogleApiServerUtils.Action = req.params.action as GoogleApiServerUtils.Action;
+ const sector: GoogleApiServerUtils.Service = req.params.sector as GoogleApiServerUtils.Service;
+ const action: GoogleApiServerUtils.Action = req.params.action as GoogleApiServerUtils.Action;
const endpoint = await GoogleApiServerUtils.GetEndpoint(GoogleApiServerUtils.Service[sector], user.id);
- let handler = EndpointHandlerMap.get(action);
+ const handler = EndpointHandlerMap.get(action);
if (endpoint && handler) {
- handler(endpoint, req.body)
- .then(response => res.send(response.data))
- .catch(exception => res.send(exception));
+ try {
+ const response = await handler(endpoint, req.body);
+ res.send(response.data);
+ } catch (e) {
+ res.send(e);
+ }
return;
}
res.send(undefined);
diff --git a/src/server/ApiManagers/GooglePhotosManager.ts b/src/server/ApiManagers/GooglePhotosManager.ts
index 4a0c0b936..e2539f120 100644
--- a/src/server/ApiManagers/GooglePhotosManager.ts
+++ b/src/server/ApiManagers/GooglePhotosManager.ts
@@ -47,7 +47,7 @@ export default class GooglePhotosManager extends ApiManager {
if (!token) {
return _error(res, authenticationError);
}
- let failed: GooglePhotosUploadFailure[] = [];
+ const failed: GooglePhotosUploadFailure[] = [];
const batched = BatchedArray.from<GooglePhotosUploadUtils.UploadSource>(media, { batchSize: 25 });
const newMediaItems = await batched.batchedMapPatientInterval<NewMediaItem>(
{ magnitude: 100, unit: TimeUnit.Milliseconds },
@@ -87,7 +87,7 @@ export default class GooglePhotosManager extends ApiManager {
let failed = 0;
if (contents) {
const completed: Opt<DashUploadUtils.ImageUploadInformation>[] = [];
- for (let item of contents.mediaItems) {
+ for (const item of contents.mediaItems) {
const { contentSize, ...attributes } = await DashUploadUtils.InspectImage(item.baseUrl);
const found: Opt<DashUploadUtils.ImageUploadInformation> = await Database.Auxiliary.QueryUploadHistory(contentSize!);
if (!found) {
diff --git a/src/server/ApiManagers/PDFManager.ts b/src/server/ApiManagers/PDFManager.ts
index 151b48dd9..a190ab0cb 100644
--- a/src/server/ApiManagers/PDFManager.ts
+++ b/src/server/ApiManagers/PDFManager.ts
@@ -8,7 +8,7 @@ const imageSize = require("probe-image-size");
import * as express from "express";
import * as path from "path";
import { Directory, serverPathToFile, clientPathToFile } from "./UploadManager";
-import { ConsoleColors } from "../ActionUtilities";
+import { red } from "colors";
export default class PDFManager extends ApiManager {
@@ -32,10 +32,10 @@ function getOrCreateThumbnail(thumbnailName: string, res: express.Response) {
const path = serverPathToFile(Directory.pdf_thumbnails, thumbnailName);
exists(path, (exists: boolean) => {
if (exists) {
- let existingThumbnail = createReadStream(path);
+ const existingThumbnail = createReadStream(path);
imageSize(existingThumbnail, (err: any, { width, height }: any) => {
if (err) {
- console.log(ConsoleColors.Red, `In PDF thumbnail response, unable to determine dimensions of ${thumbnailName}:`);
+ console.log(red(`In PDF thumbnail response, unable to determine dimensions of ${thumbnailName}:`));
console.log(err);
return;
}
@@ -81,7 +81,7 @@ async function CreateThumbnail(file: string, pageNumber: number, res: express.Re
});
});
out.on("error", error => {
- console.log(ConsoleColors.Red, `In PDF thumbnail creation, encountered the following error when piping ${pngFile}:`);
+ console.log(red(`In PDF thumbnail creation, encountered the following error when piping ${pngFile}:`));
console.log(error);
});
}
@@ -89,8 +89,8 @@ async function CreateThumbnail(file: string, pageNumber: number, res: express.Re
class NodeCanvasFactory {
create = (width: number, height: number) => {
- var canvas = createCanvas(width, height);
- var context = canvas.getContext('2d');
+ const canvas = createCanvas(width, height);
+ const context = canvas.getContext('2d');
return {
canvas,
context
diff --git a/src/server/ApiManagers/SearchManager.ts b/src/server/ApiManagers/SearchManager.ts
index d3f8995b0..7afecbb18 100644
--- a/src/server/ApiManagers/SearchManager.ts
+++ b/src/server/ApiManagers/SearchManager.ts
@@ -1,7 +1,7 @@
import ApiManager, { Registration } from "./ApiManager";
import { Method } from "../RouteManager";
import { Search } from "../Search";
-var findInFiles = require('find-in-files');
+const findInFiles = require('find-in-files');
import * as path from 'path';
import { pathToDirectory, Directory } from "./UploadManager";
@@ -13,14 +13,14 @@ export default class SearchManager extends ApiManager {
method: Method.GET,
subscription: "/textsearch",
onValidation: async ({ req, res }) => {
- let q = req.query.q;
+ const q = req.query.q;
if (q === undefined) {
res.send([]);
return;
}
- let results = await findInFiles.find({ 'term': q, 'flags': 'ig' }, pathToDirectory(Directory.text), ".txt$");
- let resObj: { ids: string[], numFound: number, lines: string[] } = { ids: [], numFound: 0, lines: [] };
- for (var result in results) {
+ const results = await findInFiles.find({ 'term': q, 'flags': 'ig' }, pathToDirectory(Directory.text), ".txt$");
+ const resObj: { ids: string[], numFound: number, lines: string[] } = { ids: [], numFound: 0, lines: [] };
+ for (const result in results) {
resObj.ids.push(path.basename(result, ".txt").replace(/upload_/, ""));
resObj.lines.push(results[result].line);
resObj.numFound++;
@@ -39,7 +39,7 @@ export default class SearchManager extends ApiManager {
res.send([]);
return;
}
- let results = await Search.Instance.search(solrQuery);
+ const results = await Search.Instance.search(solrQuery);
res.send(results);
}
});
diff --git a/src/server/ApiManagers/UploadManager.ts b/src/server/ApiManagers/UploadManager.ts
index 80ae0ad61..da1f83b75 100644
--- a/src/server/ApiManagers/UploadManager.ts
+++ b/src/server/ApiManagers/UploadManager.ts
@@ -2,7 +2,7 @@ import ApiManager, { Registration } from "./ApiManager";
import { Method, _success } from "../RouteManager";
import * as formidable from 'formidable';
import v4 = require('uuid/v4');
-var AdmZip = require('adm-zip');
+const AdmZip = require('adm-zip');
import { extname, basename, dirname } from 'path';
import { createReadStream, createWriteStream, unlink, readFileSync } from "fs";
import { publicDirectory, filesDirectory } from "..";
@@ -42,12 +42,12 @@ export default class UploadManager extends ApiManager {
method: Method.POST,
subscription: "/upload",
onValidation: async ({ req, res }) => {
- let form = new formidable.IncomingForm();
+ const form = new formidable.IncomingForm();
form.uploadDir = pathToDirectory(Directory.parsed_files);
form.keepExtensions = true;
return new Promise<void>(resolve => {
form.parse(req, async (_err, _fields, files) => {
- let results: any[] = [];
+ const results: any[] = [];
for (const key in files) {
const result = await DashUploadUtils.upload(files[key]);
result && results.push(result);
@@ -63,7 +63,7 @@ export default class UploadManager extends ApiManager {
method: Method.POST,
subscription: "/uploadDoc",
onValidation: ({ req, res }) => {
- let form = new formidable.IncomingForm();
+ const form = new formidable.IncomingForm();
form.keepExtensions = true;
// let path = req.body.path;
const ids: { [id: string]: string } = {};
@@ -122,8 +122,8 @@ export default class UploadManager extends ApiManager {
zip.getEntries().forEach((entry: any) => {
if (!entry.entryName.startsWith("files/")) return;
let directory = dirname(entry.entryName) + "/";
- let extension = extname(entry.entryName);
- let base = basename(entry.entryName).split(".")[0];
+ const extension = extname(entry.entryName);
+ const base = basename(entry.entryName).split(".")[0];
try {
zip.extractEntryTo(entry.entryName, publicDirectory, true, false);
directory = "/" + directory;
@@ -139,7 +139,7 @@ export default class UploadManager extends ApiManager {
const json = zip.getEntry("doc.json");
let docs: any;
try {
- let data = JSON.parse(json.getData().toString("utf8"));
+ const data = JSON.parse(json.getData().toString("utf8"));
docs = data.docs;
id = data.id;
docs = Object.keys(docs).map(key => docs[key]);
@@ -189,7 +189,7 @@ export default class UploadManager extends ApiManager {
return imageDataUri.outputFile(uri, serverPathToFile(Directory.images, filename)).then((savedName: string) => {
const ext = extname(savedName).toLowerCase();
const { pngs, jpgs } = AcceptibleMedia;
- let resizers = [
+ const resizers = [
{ resizer: sharp().resize(100, undefined, { withoutEnlargement: true }), suffix: "_s" },
{ resizer: sharp().resize(400, undefined, { withoutEnlargement: true }), suffix: "_m" },
{ resizer: sharp().resize(900, undefined, { withoutEnlargement: true }), suffix: "_l" },
diff --git a/src/server/ApiManagers/UtilManager.ts b/src/server/ApiManagers/UtilManager.ts
index c1234be6c..601a7d0d0 100644
--- a/src/server/ApiManagers/UtilManager.ts
+++ b/src/server/ApiManagers/UtilManager.ts
@@ -35,11 +35,11 @@ export default class UtilManager extends ApiManager {
method: Method.GET,
subscription: "/buxton",
onValidation: async ({ res }) => {
- let cwd = '../scraping/buxton';
+ const cwd = '../scraping/buxton';
- let onResolved = (stdout: string) => { console.log(stdout); res.redirect("/"); };
- let onRejected = (err: any) => { console.error(err.message); res.send(err); };
- let tryPython3 = () => command_line('python3 scraper.py', cwd).then(onResolved, onRejected);
+ const onResolved = (stdout: string) => { console.log(stdout); res.redirect("/"); };
+ const onRejected = (err: any) => { console.error(err.message); res.send(err); };
+ const tryPython3 = () => command_line('python3 scraper.py', cwd).then(onResolved, onRejected);
return command_line('python scraper.py', cwd).then(onResolved, tryPython3);
},
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2025-11-13 09:17:04 +0000