aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Harley2018-04-26 05:00:31 +0100
committerTom Harley2018-04-26 05:00:31 +0100
commit33617bc1a2d24e269af29d0250fe95493971ffd8 (patch)
tree96baa2ed9674f64ac238f9ddddf6f9a5aed472b5
parentFix user privilege mismatch (diff)
downloadmedicine-33617bc1a2d24e269af29d0250fe95493971ffd8.tar.gz
medicine-33617bc1a2d24e269af29d0250fe95493971ffd8.zip

Miscellaneous minor fixes

-rw-r--r--src/FileRouter.ts5
-rw-r--r--src/fileChunk.py4
-rw-r--r--src/files.ts21
-rw-r--r--src/index.ts8
-rw-r--r--src/profiler/index.d.ts7
-rw-r--r--src/profiler/index.js2
6 files changed, 29 insertions, 18 deletions
diff --git a/src/FileRouter.ts b/src/FileRouter.ts
index 35d3977..957b596 100644
--- a/src/FileRouter.ts
+++ b/src/FileRouter.ts
@@ -569,7 +569,7 @@ const postProjectName: Middleware = async(
}
});
if (ujp != null) {
- logger.debug(`Removing ${req.body.username}'s old privileges in ${project.name}`);
+ logger.debug(`Removing ${req.body.username}'s old privileges in ${project.name}`);
await ujp.destroy();
}
if (req.body.access_level !== 'none') {
@@ -851,7 +851,7 @@ const postFilePath: Middleware = async(
if (res.locals.file) {
/* tslint:disable-next-line:curly */
- if (req.query.action) switch (req.query.action) {
+ if (req.query.action && req.query.action !== 'upload') switch (req.query.action) {
case 'set_metadata': {
res.locals.file.metadata = JSON.parse(req.body.toString());
await res.locals.file.save();
@@ -934,7 +934,6 @@ const postFilePath: Middleware = async(
}
}
} else {
- /* tslint:disable-next-line:curly */
if (req.query.action) {
switch (req.query.action) {
case 'mkdir': {
diff --git a/src/fileChunk.py b/src/fileChunk.py
index b8a00c5..47441c6 100644
--- a/src/fileChunk.py
+++ b/src/fileChunk.py
@@ -1,7 +1,7 @@
import requests
-token = "Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJvYmplY3QiOnsidXNlcm5hbWUiOiJoYWZlZXoiLCJwYXNzd29yZEludGVybmFsIjpudWxsLCJjcmVhdGlvbkRhdGUiOiIyMDE4LTA0LTIzVDA2OjA1OjQwLjYwNloiLCJ1cGRhdGVkQXQiOiIyMDE4LTA0LTIzVDA2OjA1OjQwLjYwNloiLCJ1c2VyR3JvdXBzIjpbeyJpZCI6MSwibmFtZSI6ImxvZ2dpbmciLCJjYW5DcmVhdGVVc2VycyI6bnVsbCwiY2FuRGVsZXRlVXNlcnMiOm51bGwsImNhbkVkaXRVc2VycyI6bnVsbCwiY2FuQ3JlYXRlUHJvamVjdHMiOm51bGwsImNhbkRlbGV0ZVByb2plY3RzIjpudWxsLCJjYW5FZGl0UHJvamVjdHMiOm51bGwsImNhbkFjY2Vzc0xvZ3MiOnRydWUsImlzSW50ZXJuYWwiOmZhbHNlLCJkZXNjcmlwdGlvbiI6IkFsbG93cyBQb3N0IHRvIExvZyIsIlVzZXJIYXNQcml2aWxlZ2UiOnsidXNlcm5hbWUiOiJoYWZlZXoiLCJwcml2aWxlZ2VJZCI6MX19LHsiaWQiOjIsIm5hbWUiOiJhZG1pbiIsImNhbkNyZWF0ZVVzZXJzIjp0cnVlLCJjYW5EZWxldGVVc2VycyI6dHJ1ZSwiY2FuRWRpdFVzZXJzIjp0cnVlLCJjYW5DcmVhdGVQcm9qZWN0cyI6dHJ1ZSwiY2FuRGVsZXRlUHJvamVjdHMiOnRydWUsImNhbkVkaXRQcm9qZWN0cyI6dHJ1ZSwiY2FuQWNjZXNzTG9ncyI6bnVsbCwiaXNJbnRlcm5hbCI6ZmFsc2UsImRlc2NyaXB0aW9uIjoiU3lzdGVtcyBhZG1pbiIsIlVzZXJIYXNQcml2aWxlZ2UiOnsidXNlcm5hbWUiOiJoYWZlZXoiLCJwcml2aWxlZ2VJZCI6Mn19XSwicHJvamVjdHMiOltdfSwiaWF0IjoxNTI0NDYzNTY3LCJleHAiOjE1MjQ0ODUxNjd9.uJIsxoUyqECt_4rJFpipcT12E0dmWsQi_381usVg0zY"
-chunksize = 1024 * 1024 * 4;
+token = "Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJvYmplY3QiOnsidXNlcm5hbWUiOiJoYWZlZXoiLCJwYXNzd29yZEludGVybmFsIjpudWxsLCJjcmVhdGlvbkRhdGUiOiIyMDE4LTA0LTI2VDAxOjUwOjIzLjEwOVoiLCJ1cGRhdGVkQXQiOiIyMDE4LTA0LTI2VDAxOjUwOjIzLjEwOVoiLCJ1c2VyR3JvdXBzIjpbeyJpZCI6MSwibmFtZSI6ImxvZ2dpbmciLCJjYW5DcmVhdGVVc2VycyI6bnVsbCwiY2FuRGVsZXRlVXNlcnMiOm51bGwsImNhbkVkaXRVc2VycyI6bnVsbCwiY2FuQ3JlYXRlUHJvamVjdHMiOm51bGwsImNhbkRlbGV0ZVByb2plY3RzIjpudWxsLCJjYW5FZGl0UHJvamVjdHMiOm51bGwsImNhbkFjY2Vzc0xvZ3MiOnRydWUsImlzSW50ZXJuYWwiOmZhbHNlLCJkZXNjcmlwdGlvbiI6IkFsbG93cyBQb3N0IHRvIExvZyIsIlVzZXJIYXNQcml2aWxlZ2UiOnsidXNlcm5hbWUiOiJoYWZlZXoiLCJwcml2aWxlZ2VJZCI6MX19LHsiaWQiOjIsIm5hbWUiOiJhZG1pbiIsImNhbkNyZWF0ZVVzZXJzIjp0cnVlLCJjYW5EZWxldGVVc2VycyI6dHJ1ZSwiY2FuRWRpdFVzZXJzIjp0cnVlLCJjYW5DcmVhdGVQcm9qZWN0cyI6dHJ1ZSwiY2FuRGVsZXRlUHJvamVjdHMiOnRydWUsImNhbkVkaXRQcm9qZWN0cyI6dHJ1ZSwiY2FuQWNjZXNzTG9ncyI6bnVsbCwiaXNJbnRlcm5hbCI6ZmFsc2UsImRlc2NyaXB0aW9uIjoiU3lzdGVtcyBhZG1pbiIsIlVzZXJIYXNQcml2aWxlZ2UiOnsidXNlcm5hbWUiOiJoYWZlZXoiLCJwcml2aWxlZ2VJZCI6Mn19XSwicHJvamVjdHMiOlt7Im5hbWUiOiJmYWtlLXByb2plY3QiLCJyb290Rm9sZGVySWQiOiJmNTYzYzQxNC01MzFlLTRmZjctODFiOC1hNGZlM2Y3NTM5ZmYiLCJjcmVhdGlvbkRhdGUiOiIyMDE4LTA0LTI2VDAzOjMzOjIzLjI1N1oiLCJsYXN0QWN0aXZpdHkiOiIyMDE4LTA0LTI2VDAzOjMzOjIzLjI1N1oiLCJVc2VySm9pbnNQcm9qZWN0Ijp7InVzZXJuYW1lIjoiaGFmZWV6IiwicHJvamVjdE5hbWUiOiJmYWtlLXByb2plY3QiLCJjb250cmlidXRvckdyb3VwTmFtZSI6InByb2plY3RPd25lciIsImpvaW5EYXRlIjoiMjAxOC0wNC0yNlQwMzozMzoyMy4yNzdaIiwidXBkYXRlZEF0IjoiMjAxOC0wNC0yNlQwMzozMzoyMy4yNzdaIiwiY29udHJpYnV0b3JHcm91cElkIjpudWxsfX0seyJuYW1lIjoicmVmc2ciLCJyb290Rm9sZGVySWQiOiIzZWRmN2E0Ny1jOTFlLTQ1MmItYjc5Ni01MzcxOThlNmEyYzEiLCJjcmVhdGlvbkRhdGUiOiIyMDE4LTA0LTI2VDAyOjEwOjE3LjM4MVoiLCJsYXN0QWN0aXZpdHkiOiIyMDE4LTA0LTI2VDAyOjEwOjE3LjM4MVoiLCJVc2VySm9pbnNQcm9qZWN0Ijp7InVzZXJuYW1lIjoiaGFmZWV6IiwicHJvamVjdE5hbWUiOiJyZWZzZyIsImNvbnRyaWJ1dG9yR3JvdXBOYW1lIjoicHJvamVjdE93bmVyIiwiam9pbkRhdGUiOiIyMDE4LTA0LTI2VDAyOjEwOjE3LjM5MloiLCJ1cGRhdGVkQXQiOiIyMDE4LTA0LTI2VDAyOjEwOjE3LjM5MloiLCJjb250cmlidXRvckdyb3VwSWQiOm51bGx9fSx7Im5hbWUiOiJ0b210b20iLCJyb290Rm9sZGVySWQiOiJmNWYzMjkzOC02MWUxLTRkMDYtOTljMy05ZDY5YjJkZjBiNzAiLCJjcmVhdGlvbkRhdGUiOiIyMDE4LTA0LTI2VDAxOjUzOjIwLjMzMloiLCJsYXN0QWN0aXZpdHkiOiIyMDE4LTA0LTI2VDAxOjUzOjIwLjMzMloiLCJVc2VySm9pbnNQcm9qZWN0Ijp7InVzZXJuYW1lIjoiaGFmZWV6IiwicHJvamVjdE5hbWUiOiJ0b210b20iLCJjb250cmlidXRvckdyb3VwTmFtZSI6InByb2plY3RPd25lciIsImpvaW5EYXRlIjoiMjAxOC0wNC0yNlQwMTo1MzoyMC4zNDBaIiwidXBkYXRlZEF0IjoiMjAxOC0wNC0yNlQwMTo1MzoyMC4zNDBaIiwiY29udHJpYnV0b3JHcm91cElkIjpudWxsfX1dfSwiaWF0IjoxNTI0NzEzOTAzLCJleHAiOjE1MjQ3MzU1MDN9.E9yz7zEbQgM1AFfRB0roYnPFS5aj3ZwPHJ4uqloMRrE"
+chunksize = 1024 * 4;
def read_in_chunks(file_object):
diff --git a/src/files.ts b/src/files.ts
index 6167bd4..1c70d8a 100644
--- a/src/files.ts
+++ b/src/files.ts
@@ -17,7 +17,7 @@ import { SupportedViews } from './conversion/types/helpers'
import { CZITileRequest } from './conversion/types/customPyramidIndex'
const readDir = require('util').promisify(fs.readdir);
const readFile = require('util').promisify(fs.readFile);
-const cache = require('redis').createClient(13337);
+const cache = require('redis').createClient();
cache.on("error", function(err: any) {
logger.error("Redis_Error: " + err);
})
@@ -127,10 +127,11 @@ export const tempPath: (file: string, project: string) => string = (
): string =>
`${TEMP_BASE_DIRECTORY}/${uuid.generate()}`;
-export const saveFile: (data: Buffer, projectName: string,
- fileId: string, query: Query) => Promise<void> =
- async(data: Buffer, projectName: string,
- fileId: string, query: Query): Promise<void> => {
+export const saveFile: (
+ data: Buffer, projectName: string, fileId: string, query: Query
+) => Promise<void> = async(
+ data: Buffer, projectName: string, fileId: string, query: Query
+): Promise<void> => {
// Ensure file exists
await fs.ensureFile(path(fileId, projectName));
// Truncate to offset
@@ -141,11 +142,11 @@ export const saveFile: (data: Buffer, projectName: string,
// Open file
const fd: number = await fs.open(path(fileId, projectName), 'r+');
// Write data to file
- fs.write(fd, data, 0, data.length, Number(fuckingOffset), (err: any, bytesWritten: number, buffer: Buffer) => {
- if (err) {
- logger.failure("Error while writing to file: " + err);
- }
- });
+ try {
+ await fs.write(fd, data, 0, data.length, Number(fuckingOffset));
+ } catch (err) {
+ logger.failure("Error while writing to file: " + err);
+ }
};
export const deleteFile: (fileId: string, projectName: string) => void = async(
diff --git a/src/index.ts b/src/index.ts
index 4120fef..d26c867 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -1,5 +1,6 @@
import * as fs from 'fs-extra';
import { logger } from './logger';
+import { RemoteResolver, remote } from './profiler';
logger.info('Starting up server');
logger.info('Creating necessary directories');
@@ -153,9 +154,12 @@ async function reset(): Promise<void> {
username: 'hafeez'
}
});
-
}
+remote('Reset DB', (res: RemoteResolver): void => {
+ reset().then(() => res({ success: true }));
+});
+
// tslint:disable:no-floating-promises
(async(): Promise<void> => {
try {
@@ -166,7 +170,7 @@ async function reset(): Promise<void> {
process.exit(1);
}
- //await reset();
+ // await reset();
logger.info('Booting ExpressJS server');
app.listen(port, (err: Error) => {
diff --git a/src/profiler/index.d.ts b/src/profiler/index.d.ts
index 0aae355..d4e45ad 100644
--- a/src/profiler/index.d.ts
+++ b/src/profiler/index.d.ts
@@ -44,3 +44,10 @@ export const profiler: {
update: (value: number) => void;
};
};
+
+export type RemoteResolver = (ret: { success: boolean }) => void;
+
+export const remote: (
+ name: string,
+ logic: (res: RemoteResolver) => void
+) => void;
diff --git a/src/profiler/index.js b/src/profiler/index.js
index 24c187e..b21574a 100644
--- a/src/profiler/index.js
+++ b/src/profiler/index.js
@@ -3,4 +3,4 @@ let pmx = require('pmx').init({
ports: true
});
-module.exports = { profiler: pmx.probe() };
+module.exports = { profiler: pmx.probe(), remote: pmx.action };