Skip to content
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.

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

test staging #52

Merged
merged 3 commits into from
Apr 14, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Prev Previous commit
test 3
  • Loading branch information
mjhuff committed Apr 14, 2023
commit a6fcf7ad7d7b328f987a7b078c7f2d1cfa733dd8
2 changes: 0 additions & 2 deletions .gitignore

This file was deleted.

54 changes: 28 additions & 26 deletions server/server.js
Original file line number Diff line number Diff line change
@@ -1,39 +1,39 @@
const path = require("path");
const express = require("express");
const fsController = require("./controllers/fsController.js");
const path = require('path');
const express = require('express');
const fsController = require('./controllers/fsController.js');
const {
rCloneCopyController,
rcloneListBuckets,
} = require("./controllers/rcloneController");
rcloneListBuckets
} = require('./controllers/rcloneController');
const {
assignVariablesForFS,
getBucketLoc,
} = require("./controllers/assignController.js");
const resetAWSConfig = require("./controllers/resetAWSController.js");
const { rcloneCopyString } = require("./services/rcloneCopyString.js");
getBucketLoc
} = require('./controllers/assignController.js');
const resetAWSConfig = require('./controllers/resetAWSController.js');
const { rcloneCopyString } = require('./services/rcloneCopyString.js');
const app = express();
const http = require("http");
const http = require('http');
const server = http.createServer(app);
const { Server } = require("socket.io");
const { Server } = require('socket.io');
const io = new Server(server, {
cors: {
origin: "*",
},
origin: '*'
}
});

app.use(express.json());

const servePath =
process.env.NODE_ENV === "development" ? "../client/public" : "../build";
process.env.NODE_ENV === 'development' ? '../client/public' : '../build';

app.use(express.static(path.resolve(__dirname, servePath)));

app.post("/listBuckets", resetAWSConfig, rcloneListBuckets, (req, res) => {
app.post('/listBuckets', resetAWSConfig, rcloneListBuckets, (req, res) => {
return res.status(200).json(res.locals.buckets);
});

app.post(
"/transfer",
'/transfer',
resetAWSConfig,
getBucketLoc,
assignVariablesForFS,
Expand All @@ -42,32 +42,32 @@ app.post(
(req, res) => {
//If a string ever returns 'access denied', pass that to the client.
let isAccessDenied = false;
res.locals.rcloneCopy.stdout.on("data", (data) => {
res.locals.rcloneCopy.stdout.on('data', (data) => {
if (isAccessDenied) return;
const relevantString = rcloneCopyString(data.toString());
if (relevantString === "accessDenied") isAccessDenied = true;
io.emit("data transfer", relevantString);
if (relevantString === 'accessDenied') isAccessDenied = true;
io.emit('data transfer', relevantString);
});
return res.sendStatus(200);
}
);

app.get("/removeConfig", fsController.removeConfig, (req, res) => {
app.get('/removeConfig', fsController.removeConfig, (req, res) => {
return res.sendStatus(200);
});

//Redirect if there's any request to a page that doesn't exist.
app.get("*", (req, res) => {
return res.redirect("/");
app.get('*', (req, res) => {
return res.redirect('/');
});

//GLOBAL ERROR HANDLER NEEDED.
app.use((err, req, res, next) => {
const defaultErr = {
log: "Express error handler caught unknown middleware error",
log: 'Express error handler caught unknown middleware error',
status: 500,
message: { err: "An error occurred" },
field: "",
message: { err: 'An error occurred' },
field: ''
};
const errorObj = Object.assign({}, defaultErr, err);
console.log(errorObj.log);
Expand All @@ -76,6 +76,8 @@ app.use((err, req, res, next) => {
.json({ message: errorObj.message, field: errorObj.field });
});

server.listen(3000, () => console.log("Serving listening on port 3000..."));
//Test 2

server.listen(3000, () => console.log('Serving listening on port 3000...'));

module.exports = { io };