fix(entities): prevent dates from being proxied

Applying proxies to date objects causes trouble and gives us no value atm anyway.
legovaer · Feb 28, 2021 · d861486 · d861486
1 parent 5dfc4a8
commit d861486
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/src/entities/entities.service.spec.ts b/src/entities/entities.service.spec.ts
@@ -56,6 +56,24 @@ describe('EntitiesService', () => {
       expect(util.types.isProxy(returnedEntity)).toBeTruthy();
     });
 
+    it("should proxify object properties", () => {
+      const entity = new Sensor('example', 'Example Sensor');
+      const returnedEntity = service.add(entity);
+
+      returnedEntity.attributes.object = {};
+
+      expect(util.types.isProxy(returnedEntity.attributes.object)).toBeTruthy();
+    });
+
+    it("should not proxify Date properties", () => {
+      const entity = new Sensor('example', 'Example Sensor');
+      const returnedEntity = service.add(entity);
+
+      returnedEntity.attributes.date = new Date();
+
+      expect(util.types.isProxy(returnedEntity.attributes.date)).toBeFalsy();
+    });
+
     it('should return all registered entities', () => {
       const entities = [];
       entities.push(service.add(new Sensor('sensor', 'Test')));

diff --git a/src/entities/entity.proxy.ts b/src/entities/entity.proxy.ts
@@ -6,7 +6,7 @@ export class EntityProxyHandler implements ProxyHandler<Entity> {
   }
 
   get(target: Entity, p: PropertyKey): any {
-    if (typeof target[p] === 'object' && target[p] !== null) {
+    if (typeof target[p] === 'object' && target[p] !== null && !(target[p] instanceof Date)) {
       return new Proxy(target[p], new EntityPropertyProxyHandler(`/${p.toString()}`, (diff) => this.emitEntityUpdate(target, diff)));
     } else {
       return target[p]
@@ -40,7 +40,7 @@ class EntityPropertyProxyHandler<T extends object> implements ProxyHandler<T> {
   }
 
   get(target: T, p: PropertyKey): any {
-    if (typeof target[p] === 'object' && target[p] !== null) {
+    if (typeof target[p] === 'object' && target[p] !== null && !(target[p] instanceof Date)) {
       return new Proxy(target[p], new EntityPropertyProxyHandler(`${this.path}/${p.toString()}`, this.emitterFunc));
     } else {
       return target[p]