Remove date parsing

src/commands/host-transport/listproperties.ts

@@ -1,11 +1,43 @@
-import { findMatches } from '../../util';
+import { findMatches, PropertyValue } from '../../util';
 import { PropertyMap } from '../../util';
 import TransportParseAllCommand from '../abstract/transportParseAll';
 
-export default class ListPropertiesCommand extends TransportParseAllCommand<PropertyMap> {
-    protected Cmd = 'shell:getprop';
+type ParsedPropertyValue = Exclude<PropertyValue, null | undefined>;
+const valueParser = (
+    type: string | undefined,
+    value: string
+): ParsedPropertyValue => {
+    switch (type) {
+        case 'bool':
+        case 'int':
+            try {
+                return JSON.parse(value);
+            } catch {
+                return value;
+            }
+        default:
+            return value;
+    }
+};
+
+export default class ListPropertiesCommand extends TransportParseAllCommand<
+    PropertyMap<ParsedPropertyValue>
+> {
+    protected Cmd = 'shell:getprop -T && getprop';
 
-    protected parse(value: string): PropertyMap {
-        return findMatches(value, /^\[([\s\S]*?)\]: \[([\s\S]*?)\]?$/gm, 'map');
+    protected parse(value: string): PropertyMap<ParsedPropertyValue> {
+        const matches = findMatches(
+            value,
+            /^\[([\s\S]*?)\]: \[([\s\S]*?)\]?$/gm
+        ) as [string, string][];
+        const typeMap = new Map(matches.slice(0, matches.length / 2));
+        return new Map(
+            matches
+                .slice(matches.length / 2)
+                .map(([key, value]) => [
+                    key,
+                    valueParser(typeMap.get(key), value)
+                ])
+        );
     }
 }

src/util/functions.ts

@@ -26,10 +26,6 @@ export const stringToType = (value: string): PropertyValue => {
         }
         return parsed;
     } catch {
-        const date = new Date(value);
-        if (!isNaN(date.getMilliseconds())) {
-            return date;
-        }
         return value || undefined;
     }
 };

src/util/types.ts

@@ -129,7 +129,10 @@ export interface ForwardsObject extends ReversesForwardsBase {
 
 export type PrimitiveType = string | boolean | number | null | undefined;
 
-export type PropertyValue = PrimitiveType | Date;
+/**
+ * @deprecated Will not contain @type {Date} anymore, will replaced by @type {PrimitiveType}
+ */
+export type PropertyValue = PrimitiveType;
 
 export type PrimitiveDictionary = Record<string, PropertyValue>;
 
@@ -416,7 +419,7 @@ export interface CpOptions
     copyToTarget?: boolean;
 }
 
-export type PropertyMap = Map<string, PropertyValue>;
+export type PropertyMap<T = PropertyValue> = Map<string, T>;
 
 export type NonFunctionPropertyNames<T> = {
     [K in keyof T]: T[K] extends () => void ? never : K;