Merge pull request #79 from BasicPrimitives/feathersjs

Removed dependency on feathersjs, upgraded packages to latest

Author: BasicPrimitives

server/package.json

@@ -16,36 +16,21 @@
         "dev": "cross-env NODE_PATH=src NODE_ENV=development APIPORT=3030 node ./src/server.js"
     },
     "dependencies": {
-        "@feathersjs/authentication": "^2.1.0",
-        "@feathersjs/authentication-client": "^1.0.1",
-        "@feathersjs/authentication-jwt": "^2.0.0",
-        "@feathersjs/authentication-local": "^1.0.2",
-        "@feathersjs/authentication-oauth2": "^1.0.2",
-        "@feathersjs/errors": "^3.2.0",
-        "@feathersjs/express": "^1.1.2",
-        "@feathersjs/feathers": "^3.0.2",
-        "@feathersjs/rest-client": "^1.3.2",
-        "@feathersjs/socketio": "^3.0.1",
-        "@feathersjs/socketio-client": "^1.0.1",
         "basicprimitives": "6.5.1",
-        "compression": "^1.6.2",
-        "cookie-parser": "^1.4.3",
+        "compression": "^1.7.5",
+        "cookie-parser": "^1.4.7",
         "cookies-js": "^1.2.3",
-        "express": "^4.15.4",
-        "express-session": "^1.15.5",
-        "feathers-authentication-hooks": "^0.3.0",
-        "feathers-hooks-common": "^4.10.0",
-        "feathers-nedb": "^4.0.1",
+        "express": "^4.21.1",
+        "express-session": "^1.18.1",
         "hooks": "^0.3.2",
         "lodash": "^4.17.10",
         "memory-cache": "^0.2.0",
         "morgan": "^1.10.0",
-        "nedb": "^1.8.0",
-        "newrelic": "^7.1.0",
+        "newrelic": "^12.8.0",
         "nprogress": "^0.2.0",
-        "passport-facebook-token": "^3.3.0",
-        "pretty-error": "^2.1.2",
-        "util": "^0.12.0"
+        "pretty-error": "^4.0.0",
+        "util": "^0.12.0",
+        "uuid": "^11.0.3"
     },
     "devDependencies": {
         "cross-env": "^7.0.2"

server/src/hooks/validateHook.js

@@ -1,13 +1,12 @@
 #!/usr/bin/env node
-const express = require('@feathersjs/express');
-const feathers = require('@feathersjs/feathers');
+const express = require('express');
 const morgan = require('morgan');
 const session = require('express-session');
 const bodyParser = require('body-parser');
 const cookieParser = require('cookie-parser');
 const PrettyError = require('pretty-error');
 const config = require('./config');
-const services = require('./services');
+const services = require('./services'); // You may want to adjust or remove this if services rely on feathers
 require('newrelic');
 
 const pretty = new PrettyError();
@@ -16,9 +15,9 @@ process.on('unhandledRejection', (reason, p) => {
   console.error('Unhandled Rejection at: Promise ', p, pretty.render(reason));
 });
 
-const fApp = express(feathers());
+const app = express();
 
-fApp.set('config', config)
+app.set('config', config)
   .use(morgan('dev'))
   .use(cookieParser())
   .use(
@@ -30,26 +29,21 @@ fApp.set('config', config)
     })
   )
   .use(bodyParser.urlencoded({ extended: true }))
-  .use(bodyParser.json())
-  // Core
-  .configure(express.rest())
-  .configure(services)
-  // Final handlers
-  .use(express.notFound())
-  .use(
-    express.errorHandler({
-      logger: {
-        error: error => {
-          if (error && error.code !== 404) {
-            console.error('API ERROR:', pretty.render(error));
-          }
-        }
-      }
-    })
-  );
+  .use(bodyParser.json());
 
-const app = express();
-app.use('/api', fApp);
+services('/api', app);
+
+// Final handlers
+app.use(express.static('public')); // Serve static files if needed
+app.use((req, res, next) => {
+  res.status(404).send('Not Found');
+});
+app.use((error, req, res, next) => {
+  if (error) {
+    console.error('API ERROR:', pretty.render(error));
+    res.status(500).send('Internal Server Error');
+  }
+});
 
 if (process.env.APIPORT) {
   app.listen(process.env.APIPORT, err => {

server/src/server.js

@@ -24,8 +24,8 @@ const financialOwnership = require('./data/financialOwnership.js');
 const mutualFinancialOwnership = require('./data/mutualFinancialOwnership.js');
 const techTree = require('./data/techTree.js');
 
-function service(app) {
-  app.use('/load-demofamilychartslist', (req, res) => {
+function service(folder, app) {
+  app.use(`${folder}/load-demofamilychartslist`, (req, res) => {
     const names = {
       '2 Cross Relations': 'crossShape',
       '3 Cross Relations': 'famdata2',
@@ -49,7 +49,7 @@ function service(app) {
     return res.json(names);
   });
 
-  app.use('/load-demofamilychart', (req, res) => {
+  app.use(`${folder}/load-demofamilychart`, (req, res) => {
     let result = { message: `Chart ${req.name} not found!` };
 
     const { name } = req.query;

server/src/services/authentication/index.js

@@ -5,8 +5,8 @@ const CrossBranchAlignment = require('./data/crossbranchalignment.js');
 const MatrixLayout = require('./data/matrixlayout.js');
 const VerticalLayoutOrganizationalChart = require('./data/verticallayoutorganizationalchart.js');
 
-function service(app) {
-  app.use('/load-demoorganizationalchart', (req, res) => {
+function service(url, app) {
+  app.use(`${url}/load-demoorganizationalchart`, (req, res) => {
     let result = { message: `Chart ${req.name} not found!` };
 
     const { name } = req.query;

server/src/services/demofamilycharts/index.js

@@ -7,8 +7,8 @@ const newrelic = require('newrelic');
 const { loadMarkdown, getSampleFileContent } = require('./markdown');
 const { URL } = require('url');
 
-module.exports = function customService(app) {
-  app.use('/load-markdown', async (req, res, next) => {
+module.exports = function customService(folder, app) {
+  app.use(`${folder}/load-markdown`, async (req, res, next) => {
     let gclid = null;
     if(req.headers.referer != null) {
       let url = new URL(req.headers.referer);
@@ -28,32 +28,32 @@ module.exports = function customService(app) {
     }
   });
 
-  app.use('/get-sample', async (req, res) => {
+  app.use(`${folder}/get-sample`, async (req, res) => {
     const fileContent = await getSampleFileContent(req.query.name);
     return res.send(fileContent);
   });
 
-  app.use('/get-saved-sample', (req, res) => {
+  app.use(`${folder}/get-saved-sample`, (req, res) => {
     let fileContent = cache.get(req.query.name);
     if (fileContent == null) {
       fileContent = '<p>Sample expired in cache. Click Try button again.</p>';
     }
     return res.send(fileContent);
   });
 
-  app.use('/save-code', (req, res) => {
+  app.use(`${folder}/save-code`, (req, res) => {
     const id = uuid.v1();
     cache.put(id, req.body.content, 60000);
     return res.json({
       url: `/api/get-saved-sample?name=${id}`
     });
   });
 
-  app.use('/images', express.static(path.join(__dirname, '..', '..', 'static', 'javascript', 'samples', 'images')));
-  app.use('/images', express.static(path.join(__dirname, '..', '..', 'static', 'react', 'docs', 'images')));
-  app.use('/javascript', express.static(path.join(__dirname, '..', '..', 'static', 'javascript')));
-  app.use('/javascript', express.static(path.join(__dirname, '..', '..', 'static', 'javascript' , 'dist')));
-  app.use('/javascript', express.static(path.join(__dirname, '..', '..', 'static', 'javascript')));
-  app.use('/data', express.static(path.join(__dirname, '..', '..', 'static', 'javascript', 'samples', 'data')));
-  app.use('/', express.static(path.join(__dirname, '..', '..', 'static')));
+  app.use(`${folder}/images`, express.static(path.join(__dirname, '..', '..', 'static', 'javascript', 'samples', 'images')));
+  app.use(`${folder}/images`, express.static(path.join(__dirname, '..', '..', 'static', 'react', 'docs', 'images')));
+  app.use(`${folder}/javascript`, express.static(path.join(__dirname, '..', '..', 'static', 'javascript')));
+  app.use(`${folder}/javascript`, express.static(path.join(__dirname, '..', '..', 'static', 'javascript' , 'dist')));
+  app.use(`${folder}/javascript`, express.static(path.join(__dirname, '..', '..', 'static', 'javascript')));
+  app.use(`${folder}/data`, express.static(path.join(__dirname, '..', '..', 'static', 'javascript', 'samples', 'data')));
+  app.use(`${folder}/`, express.static(path.join(__dirname, '..', '..', 'static')));
 }

server/src/services/demoorganizationalcharts/index.js

@@ -1,15 +1,13 @@
-const authentication = require('./authentication');
+// const authentication = require('./authentication');
 const demoorganizationalcharts = require('./demoorganizationalcharts');
 const demofamilycharts = require('./demofamilycharts');
 const howtouse = require('./howtouse');
-const users = require('./users');
 
-function services(app) {
-  app.configure(authentication);
-  app.configure(demoorganizationalcharts);
-  app.configure(demofamilycharts);
-  app.configure(users);
-  app.configure(howtouse);
+function services(url, app) {
+  // app.configure(authentication);
+  demoorganizationalcharts(url, app);
+  demofamilycharts(url, app);
+  howtouse(url, app);
 };
 
 module.exports = services;

server/src/services/howtouse/index.js

@@ -1 +1 @@
-Subproject commit cad96c285d38b147b53cd57d56472284e0eb14a8
+Subproject commit ef025dfc8564f04e31cda3bd329e0893616e8717

server/src/services/index.js

@@ -1 +1 @@
-Subproject commit f9e7e5f34a392f09dacd1f07f5482ab02896f23b
+Subproject commit 2832afa9c64356f282b0104b32076f19e2f3370c