unify serverless and master

* basic setup for aws

* rewrite import/exports for compatibility

* add dotenv

* aws working

* add ec2 managing lambda

* manager function logic

* add client-ec2 and logging

* finish off initial start/stop logic

* add pubsub to lambda

* add dotenv plugin

* use INSTANCE env var

* redis port process env

* npm i

* Express version runs locally!

Changes made:
1) New env variable EXPRESS, that should be passed as true, to run express version of the backend(that is with subscriptions), else false, to run the aws version of the backend, or to deploy to AWS-Lambda.
2) Changed the scripts in package.json,
    a) start_aws to run index.js of aws version.
    b) start_express to run the express version.
3) Updated the resolvers to use mongoose 6.X and now both aws and express version share common files such as models, resolvers etc.

* chor: required changes implemented.

* removed env variable for conditioning subs.

Instead used "_HANDLER" , which is not null during aws/lambda runs.

* renamed express_server to index

and changed start script to be npm start.

* Unified the AWS and Express Branches. (#150)

* Express version runs locally!

Changes made:
1) New env variable EXPRESS, that should be passed as true, to run express version of the backend(that is with subscriptions), else false, to run the aws version of the backend, or to deploy to AWS-Lambda.
2) Changed the scripts in package.json,
    a) start_aws to run index.js of aws version.
    b) start_express to run the express version.
3) Updated the resolvers to use mongoose 6.X and now both aws and express version share common files such as models, resolvers etc.

* chor: required changes implemented.

* removed env variable for conditioning subs.

Instead used "_HANDLER" , which is not null during aws/lambda runs.

* renamed express_server to index

and changed start script to be npm start.

Co-authored-by: Aadi Bajpai <[email protected]>

Author: Aadeesh11

.env.example

@@ -1,5 +1,5 @@
 DB = mongodb+srv://username:[email protected]/test?retryWrites=true&w=majority
 JWT_SECRET = somesupersecretstring
-REDIS_AUTH = yourredispasswd
-REDIS_URL = yourredisurl
-REDIS_PORT = yourredisport
+REDIS_AUTH = Redis password you get while provisioning a Redis DB
+REDIS_URL = Redis DB connection string
+REDIS_PORT = Any port you want.

graphql/resolvers.js

@@ -1,12 +1,12 @@
-import { AuthenticationError, UserInputError, withFilter } from "apollo-server-express";
-import bcrypt from "bcryptjs";
-import jwt from "jsonwebtoken";
-import { customAlphabet } from "nanoid";
-import geolib from "geolib";
+const { AuthenticationError, UserInputError, withFilter } = require("apollo-server-express");
+const bcrypt = require("bcryptjs");
+const jwt = require("jsonwebtoken");
+const { customAlphabet } = require("nanoid");
+const geolib = require("geolib");
 const { isPointWithinRadius } = geolib;
-import Beacon from "../models/beacon.js";
-import Landmark from "../models/landmark.js";
-import { User } from "../models/user.js";
+const Beacon = require("../models/beacon.js");
+const Landmark = require("../models/landmark.js");
+const { User } = require("../models/user.js");
 
 const alphabet = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
 // even if we generate 10 IDs per hour,
@@ -16,12 +16,15 @@ const nanoid = customAlphabet(alphabet, 6);
 const resolvers = {
     Query: {
         hello: () => "Hello world!",
-        me: (_parent, _args, { user }) => user.populate("beacons.leader"),
+        me: async (_parent, _args, { user }) => {
+            await user.populate("beacons.leader beacons.landmarks");
+            return user;
+        },
         beacon: async (_parent, { id }, { user }) => {
-            const beacon = await Beacon.findById(id).populate("landmarks").populate("leader");
+            const beacon = await Beacon.findById(id).populate("landmarks leader");
             if (!beacon) return new UserInputError("No beacon exists with that id.");
             // return beacon iff user in beacon
-            if (beacon.leader === user.id || beacon.followers.includes(user))
+            if (beacon.leader.id === user.id || beacon.followers.includes(user))
                 return new Error("User should be a part of beacon");
             return beacon;
         },
@@ -105,20 +108,18 @@ const resolvers = {
                 location: beacon.startLocation,
                 ...beacon,
             });
-            const newBeacon = await beaconDoc.save().then(b => b.populate("leader").execPopulate());
-
+            const newBeacon = await beaconDoc.save().then(b => b.populate("leader"));
             user.beacons.push(newBeacon.id);
             await user.save();
 
             return newBeacon;
         },
 
         changeBeaconDuration: async (_, { newExpiresAt, beaconID }, { user }) => {
-            const beacon = await Beacon.findById(beaconID).populate("leader");
+            const beacon = await Beacon.findById(beaconID);
 
             if (!beacon) return new UserInputError("No beacon exists with that id.");
-            if (beacon.leader.id != user.id)
-                return new Error("Only the leader is allowed to change the beacon duration.");
+            if (beacon.leader != user.id) return new Error("Only the leader is allowed to change the beacon duration.");
             if (beacon.startsAt.getTime() > newExpiresAt) return Error("Beacon can not expire before it has started.");
 
             beacon.expiresAt = newExpiresAt;
@@ -136,7 +137,8 @@ const resolvers = {
 
             beacon.followers.push(user);
             console.log("user joined beacon: ", user);
-            await beacon.save().then(b => b.populate("leader").execPopulate());
+            await beacon.save().then(b => b.populate("leader"));
+
             pubsub.publish("BEACON_JOINED", { beaconJoined: user, beaconID: beacon.id });
 
             user.beacons.push(beacon.id);
@@ -199,29 +201,29 @@ const resolvers = {
             return beacon;
         },
     },
-
-    Subscription: {
-        beaconLocation: {
-            subscribe: withFilter(
-                (_, __, { pubsub }) => pubsub.asyncIterator(["BEACON_LOCATION"]),
-                (payload, variables) => payload.beaconID === variables.id
-            ),
+    ...(process.env._HANDLER == null && {
+        Subscription: {
+            beaconLocation: {
+                subscribe: withFilter(
+                    (_, __, { pubsub }) => pubsub.asyncIterator(["BEACON_LOCATION"]),
+                    (payload, variables) => payload.beaconID === variables.id
+                ),
+            },
+            userLocation: {
+                subscribe: withFilter(
+                    (_, __, { pubsub }) => pubsub.asyncIterator(["BEACON_LOCATION"]),
+                    (payload, variables, { user }) => {
+                        return payload.beaconID === variables.id && payload.userLocation.id !== user.id; // account for self updates
+                    }
+                ),
+            },
+            beaconJoined: {
+                subscribe: withFilter(
+                    (_, __, { pubsub }) => pubsub.asyncIterator(["BEACON_JOINED"]),
+                    (payload, variables) => payload.beaconID === variables.id
+                ),
+            },
         },
-        userLocation: {
-            subscribe: withFilter(
-                (_, __, { pubsub }) => pubsub.asyncIterator(["BEACON_LOCATION"]),
-                (payload, variables, { user }) => {
-                    return payload.beaconID === variables.id && payload.userLocation.id !== user.id; // account for self updates
-                }
-            ),
-        },
-        beaconJoined: {
-            subscribe: withFilter(
-                (_, __, { pubsub }) => pubsub.asyncIterator(["BEACON_JOINED"]),
-                (payload, variables) => payload.beaconID === variables.id
-            ),
-        },
-    },
+    }),
 };
-
-export default resolvers;
+module.exports = resolvers;

graphql/schema.js

@@ -1,4 +1,4 @@
-import { gql } from "apollo-server-express";
+const { gql } = require("apollo-server-express");
 
 const typeDefs = gql`
     type Location {
@@ -119,4 +119,4 @@ const typeDefs = gql`
     }
 `;
 
-export default typeDefs;
+module.exports = typeDefs;

index.js renamed to index.mjs

@@ -15,10 +15,9 @@ import pubsub from "./pubsub.js";
 
 const server = new ApolloServer({
     schema: applyMiddleware(makeExecutableSchema({ typeDefs, resolvers }), permissions),
-    // schema: makeExecutableSchema({ typeDefs, resolvers }),  // to temp disable shield on dev
+    // schema: makeExecutableSchema({ typeDefs, resolvers }), // to temp disable shield on dev
     context: async ({ req, connection }) => {
         // initialize context even if it comes from subscription connection
-        // TODO: cleanup
         if (connection) {
             return { user: connection.context.user, pubsub };
         }

models/beacon.js

@@ -1,7 +1,7 @@
-import mongoose from "mongoose";
+const mongoose = require("mongoose");
 
-import LocationSchema from "./location.js";
-import { UserSchema } from "./user.js";
+const LocationSchema = require("./location.js");
+const { UserSchema } = require("./user.js");
 
 const { Schema, model } = mongoose;
 
@@ -22,4 +22,4 @@ const beaconSchema = new Schema(
     }
 );
 
-export default model("Beacon", beaconSchema, "Beacons"); // specify collection name
+module.exports = model("Beacon", beaconSchema, "Beacons"); // specify collection name

models/landmark.js

@@ -1,6 +1,6 @@
-import mongoose from "mongoose";
+const mongoose = require("mongoose");
 
-import LocationSchema from "./location.js";
+const LocationSchema = require("./location.js");
 
 const { Schema, model } = mongoose;
 
@@ -15,4 +15,4 @@ const landmarkSchema = new Schema(
     }
 );
 
-export default model("Landmark", landmarkSchema, "Landmarks"); // specify collection name
+module.exports = model("Landmark", landmarkSchema, "Landmarks"); // specify collection name

models/location.js

@@ -1,4 +1,4 @@
-import mongoose from "mongoose";
+const mongoose = require("mongoose");
 
 const { Schema } = mongoose;
 
@@ -12,4 +12,4 @@ const locationSchema = new Schema(
     }
 );
 
-export default locationSchema;
+module.exports = locationSchema;

models/user.js

@@ -1,10 +1,10 @@
-import mongoose from "mongoose";
+const mongoose = require("mongoose");
 
-import LocationSchema from "./location.js";
+const LocationSchema = require("./location.js");
 
 const { Schema, model } = mongoose;
 
-export const UserSchema = new Schema(
+const UserSchema = new Schema(
     {
         name: String,
         email: String,
@@ -18,4 +18,4 @@ export const UserSchema = new Schema(
     }
 );
 
-export const User = model("User", UserSchema, "Users"); // specify collection name
+module.exports = { UserSchema, User: model("User", UserSchema, "Users") }; // specify collection name