Merge pull request #4 from kantimam/deploy

Deploy

client/package.json

@@ -3,6 +3,7 @@
  "version": "0.1.0",
  "private": true,
  "dependencies": {
+ "@material-ui/core": "^4.11.2",
  "@testing-library/jest-dom": "^5.11.6",
  "@testing-library/react": "^11.2.2",
  "@testing-library/user-event": "^12.6.0",

client/src/App.js

@@ -21,6 +21,7 @@ import LockList from './components/lock/LockList';
 import LockCreate from './components/lock/LockCreate';
 import BuildingList from './components/building/BuildingList';
 import BuildingCreate from './components/building/BuildingCreate';
+import Dashboard from './components/dashboard';
 
 
 const isAdmin=permissions=>{
@@ -36,7 +37,7 @@ function App() {
  </p>
  }
  return (
- <Admin dataProvider={restProvider(serverAdress)} locale="en" authProvider={authProvider}>
+ <Admin dataProvider={restProvider(serverAdress)} dashboard={Dashboard} locale="en" authProvider={authProvider}>
  {permissions=>[
  <Resource icon={LocationCity} name="building" list={BuildingList} create={BuildingCreate}/>,
  <Resource icon={Lock} name="lock" list={LockList} create={LockCreate} options={{label: 'Locks'}}/>,

client/src/components/dashboard/index.js

@@ -1,11 +1,18 @@
+import { Card, CardContent, CardHeader, Typography } from '@material-ui/core'
 import React from 'react'
 
-const index = () => {
+const Dashboard = (props) => {
+ console.log(props)
  return (
- <div>
- <h1>hey</h1> 
- </div>
+ <Card>
+ <CardHeader title="Dashboard"/>
+ <CardContent>
+ <Typography>
+
+ </Typography>
+ </CardContent>
+ </Card>
  )
 }
 
-export default index
+export default Dashboard

src/controllers/readerController.ts

@@ -6,6 +6,7 @@ import { Key } from "../entity/Key";
 import getList from "../util/getList";
 import dateToUnix from "../util/dateToUnix";
 import { ReaderKey } from "../entity/ReaderKey";
+import { updateDeviceKeys } from "../services/deviceService";
 
 
 
@@ -96,8 +97,9 @@ export async function editReaderKeys(req: Request, res: Response) {
  return res.status(400).send({error: "invalid request an array readerKeys is required"})
  }
 
+ updateDeviceKeys(readerId, body.readerKeys);
  // there has to be a better option then deleting all the relationships before adding new but this should do for now
- getRepository(ReaderKey)
+ await getRepository(ReaderKey)
  .createQueryBuilder()
  .delete()
  .from(ReaderKey)
@@ -106,7 +108,7 @@ export async function editReaderKeys(req: Request, res: Response) {
 
  // check if reader with that ip exists
  const readerRepo=getRepository(Reader)
- const readerResult = await readerRepo.findOne(readerId, {relations: ["readerKeys"]})
+ const readerResult = await readerRepo.findOne(readerId, {relations: ["readerKeys", "readerKeys.key"]})
 
  if (!readerResult) throw "no door found"
 
@@ -120,7 +122,7 @@ export async function editReaderKeys(req: Request, res: Response) {
  readerResult.acctype5Name=body.acctype5Name || "";
  readerResult.acctype6Name=body.acctype6Name || "";
 
- readerResult.readerKeys=body.readerKeys;
+ readerResult.readerKeys=[...body.readerKeys];
 
  await readerRepo.save(readerResult)
 

src/entity/Key.ts

@@ -21,7 +21,7 @@ export class Key {
  isOneTimeCode: boolean
 
 
- @OneToMany(()=>ReaderKey, readerKey=>readerKey.key, { onDelete: 'CASCADE', onUpdate: 'CASCADE' })
+ @OneToMany(()=>ReaderKey, readerKey=>readerKey.key, { /* onDelete: 'CASCADE', onUpdate: 'CASCADE', */ cascade: true })
  readerKeys: ReaderKey[];
 
  @ManyToOne(()=>User, user=>user.keys, { onDelete: 'CASCADE', onUpdate: 'CASCADE' })

src/entity/Reader.ts

@@ -54,7 +54,7 @@ export class Reader {
  newKeys: NewKey[];
 
 
- @OneToMany(()=>ReaderKey, readerKey=>readerKey.reader, { onDelete: 'CASCADE', onUpdate: 'CASCADE' })
+ @OneToMany(()=>ReaderKey, readerKey=>readerKey.reader, { /* onDelete: 'CASCADE', onUpdate: 'CASCADE', */cascade: true })
  readerKeys: ReaderKey[];
 
 

src/entity/ReaderKey.ts

@@ -9,7 +9,7 @@ export class ReaderKey {
 
  @PrimaryColumn()
  readerId: number;
- @ManyToOne(() => Reader, reader => reader.readerKeys, {primary: true})
+ @ManyToOne(() => Reader, reader => reader.readerKeys, {primary: true, persistence: false})
  @JoinColumn({name: "readerId", referencedColumnName: "id"})
  reader: Reader;
 

src/mqtt/handlers.ts

@@ -70,7 +70,7 @@ async function handleHeartBeat(messageJSON) {
  /* if there already is a reader with that name and ip update it */
  foundReader.lastPing=lastPingDateTime;
  await readerRepo.save(foundReader);
- console.log("updated reader");
+ //console.log("updated reader");
  //console.log(result)
  }else {
  /* otherwise create a new one */
@@ -80,7 +80,7 @@ async function handleHeartBeat(messageJSON) {
  readerName: door
  });
  await readerRepo.save(reader)
- console.log("created new reader")
+ //console.log("created new reader")
  }
 
  } catch (error) {

src/services/deviceService.ts

@@ -0,0 +1,110 @@
+import { getRepository } from "typeorm";
+import { deleteKey } from "../controllers/keyController";
+import { Reader } from "../entity/Reader";
+import { ReaderKey } from "../entity/ReaderKey";
+import { client } from "../mqtt/connection";
+import arrayDifference from "../util/arrayDifference";
+
+
+export async function updateDeviceKeys(readerId, keys: ReaderKey[]){
+ const readerResult = await getRepository(Reader).findOne(readerId, {relations: ["readerKeys", "readerKeys.key"]})
+
+ const addedKeys=arrayDifference(keys, readerResult.readerKeys, (a, b)=>{
+ return a?.key?.uid===b?.key?.uid;
+ }) // items that are in array 1 but not in 2
+
+ const removedKeys=arrayDifference(readerResult.readerKeys, keys, (a, b)=>{
+ return a.keyId===b.keyId;
+ }) // items that are in array 2 but not in 1
+
+ console.log(`keys added`)
+ console.log(addedKeys);
+ console.log("keys removed");
+ console.log(removedKeys);
+
+
+ // delete all keys that were just removed from the DB from the device too
+ try {
+ await deleteDeviceKeys(readerResult, removedKeys);
+ } catch (error) {
+ console.log(error)
+ }
+
+}
+
+export function deleteDeviceKeys(reader: Reader, keys: ReaderKey[]): Promise<void>{
+ return new Promise((resolve, reject)=>{
+
+ const deleteUser=(readerKey: ReaderKey)=>{
+ if(client.connected && readerKey && readerKey.key){
+ client.publish('devnfc', JSON.stringify({
+ cmd: "deletuid",
+ doorip: reader.ip,
+ doorname: reader.readerName,
+ uid: readerKey.key.uid
+ }));
+ }else {
+ cleanupAndReject();
+ }
+ }
+ const cleanup=()=>{
+ clearTimeout(mqttTimeout);
+ client.off("message", mqttMessageHandler)
+
+ }
+
+ const cleanupAndResolve=()=>{
+ cleanup();
+ resolve();
+
+ }
+ const cleanupAndReject=()=>{
+ cleanup();
+ reject();
+ }
+
+ if(!keys.length){ // if there are no keys just resolve
+ resolve();
+ }
+
+ let mqttTimeout; 
+ const mqttMaxResponseTime: number=4000; // give the device max 4 seconds between messages and otherwise return
+
+
+ const mqttMessageHandler=(topic: string, message: Buffer)=> {
+ if(topic==="devnfc/devicestate" || topic==="/devnfc/devicestate"){
+ const messageString = message.toString()
+ const messageJSON = JSON.parse(messageString)
+ if(messageJSON.deviceName===reader.readerName){ // make sure message comes from the same controller
+ if(messageJSON.cmd==="deleteUserState"){
+ if(keys.length){ // after the delete is comfirmed by the device try to remove the key from the array
+ const keyIndex=keys.findIndex(item=>item.key.uid===messageJSON.deletedUID); // check if array has key with same uid
+ if(keyIndex!==-1){ // if key was found remove it
+ keys.splice(keyIndex, 1);
+ clearTimeout(mqttTimeout); // only after successfully removing a key restart the early return timer
+ mqttTimeout=setTimeout(cleanupAndReject, mqttMaxResponseTime);
+ }
+
+ }
+ // filtering might have failed to we check again if there are keys left
+ if(keys.length>0){
+ // if there are still keys left to delete send the next request
+ deleteUser(keys[0]);
+ }else {
+ // otherwise we are done
+ cleanupAndResolve();
+ }
+ console.log(messageJSON);
+ }
+ }
+ }
+ }
+
+ client.on("message", mqttMessageHandler)
+
+ deleteUser(keys[0]);
+
+ mqttTimeout=setTimeout(cleanupAndReject, mqttMaxResponseTime)
+ })
+
+}