Merge pull request #17 from Maaaartin/fix/wrong-date-parsing

Fix/wrong date parsing
Maaaartin · Nov 30, 2024 · 3295990 · 3295990
2 parents 33cc07a + 7ae06b6
commit 3295990
Show file tree

Hide file tree

Showing 13 changed files with 88 additions and 98 deletions.
diff --git a/README_DOCS.md b/README_DOCS.md
@@ -92,6 +92,11 @@ adb.listDevices((devices) => {
 
 ## Change log
 
-### 6.2
+### 6.1
 
 `exec` methods accept `string[]` as an argument. Fix for https://github.com/Maaaartin/adb-ts/issues/13.
+
+### 6.2
+
+`PropertyMap` values do not contain `Date` type. This is because parsing date is tricky https://github.com/Maaaartin/adb-ts/issues/15.
+`listFeatures` types are determined from `getprop -T` command. Types returned from this method are `number | boolean | string`.
diff --git a/__tests__/adbClient/getProp.ts b/__tests__/adbClient/getProp.ts
@@ -106,7 +106,7 @@ describe('Gep prop tests', () => {
             const port = await adbMock.start();
             const adb = new Client({ noAutoStart: true, port });
             const result = await adb.getProp('serial', 'prop');
-            expect(result).toEqual(date);
+            expect(result).toEqual(date.toISOString());
         } finally {
             await adbMock.end();
         }

diff --git a/__tests__/adbClient/getSetting.ts b/__tests__/adbClient/getSetting.ts
@@ -106,7 +106,7 @@ describe('Get setting OKAY tests', () => {
             const port = await adbMock.start();
             const adb = new Client({ noAutoStart: true, port });
             const result = await adb.getSetting('serial', 'system', 'prop');
-            expect(result).toEqual(date);
+            expect(result).toEqual(date.toISOString());
         } finally {
             await adbMock.end();
         }

diff --git a/__tests__/adbClient/listFeatures.ts b/__tests__/adbClient/listFeatures.ts
@@ -14,7 +14,7 @@ feature:two=two
 feature:three=false
 feature:four=true
 feature:five=null
-feature:six`,
+feature:six=`,
                     raw: true
                 }
             }
@@ -48,7 +48,7 @@ feature:two=two
 feature:three=false
 feature:four=true
 feature:five=null
-feature:six`,
+feature:six=`,
                     raw: true
                 }
             }
@@ -95,7 +95,7 @@ feature:six`,
     feature:three=false
     feature:four=true
     feature:five=null
-    feature:six`,
+    feature:six=`,
                     raw: true
                 }
             }

diff --git a/__tests__/adbClient/listProperties.ts b/__tests__/adbClient/listProperties.ts
@@ -9,13 +9,19 @@ describe('List properties', () => {
             {
                 cmd: 'shell:getprop',
                 res: {
-                    value: `[one]: [1]
+                    value: `[one]: [int]
+[two]: [string]
+[three]: [bool]
+[four]: [bool]
+[five]: [string]
+[six]: [string]
+[one]: [1]
 [two]: [two]
 [three]: [false]
 [four]: [true]
 [five]: [null]
 [six]: []
-[seven]: [Sun Jul 17 2022 21:11:48 GMT+0200 (Central European Summer Time)]`,
+`,
                     raw: true
                 }
             }
@@ -30,14 +36,8 @@ describe('List properties', () => {
                     ['two', 'two'],
                     ['three', false],
                     ['four', true],
-                    ['five', null],
-                    ['six', undefined],
-                    [
-                        'seven',
-                        new Date(
-                            'Sun Jul 17 2022 21:11:48 GMT+0200 (Central European Summer Time)'
-                        )
-                    ]
+                    ['five', 'null'],
+                    ['six', '']
                 ])
             );
         } finally {
@@ -56,8 +56,7 @@ describe('List properties', () => {
 [three]: [false]
 [four]: [true]
 [five]: [null]
-[six]: []
-[seven]: [Sun Jul 17 2022 21:11:48 GMT+0200 (Central European Summer Time)]`,
+[six]: []`,
                     raw: true
                 }
             }
@@ -105,8 +104,7 @@ describe('List properties', () => {
 [three]: [false]
 [four]: [true]
 [five]: [null]
-[six]: []
-[seven]: [Sun Jul 17 2022 21:11:48 GMT+0200 (Central European Summer Time)]`,
+[six]: []`,
                     raw: true
                 }
             }

diff --git a/__tests__/adbClient/listSettings.ts b/__tests__/adbClient/listSettings.ts
@@ -15,8 +15,7 @@ two="two"
 three=false
 four=true
 five=null
-six=
-seven=Sun Jul 17 2022 21:11:48 GMT+0200 (Central European Summer Time)`,
+six=`,
                     raw: true
                 }
             }
@@ -32,13 +31,7 @@ seven=Sun Jul 17 2022 21:11:48 GMT+0200 (Central European Summer Time)`,
                     ['three', false],
                     ['four', true],
                     ['five', null],
-                    ['six', undefined],
-                    [
-                        'seven',
-                        new Date(
-                            'Sun Jul 17 2022 21:11:48 GMT+0200 (Central European Summer Time)'
-                        )
-                    ]
+                    ['six', undefined]
                 ])
             );
         } finally {
@@ -75,8 +68,7 @@ seven=Sun Jul 17 2022 21:11:48 GMT+0200 (Central European Summer Time)`,
     three=false
     four=true
     five=null
-    six=
-    seven=Sun Jul 17 2022 21:11:48 GMT+0200 (Central European Summer Time)`,
+    six=`,
                     raw: true
                 }
             }
@@ -123,8 +115,7 @@ seven=Sun Jul 17 2022 21:11:48 GMT+0200 (Central European Summer Time)`,
     three=false
     four=true
     five=null
-    six=
-    seven=Sun Jul 17 2022 21:11:48 GMT+0200 (Central European Summer Time)`,
+    six=`,
                     raw: true
                 }
             }

diff --git a/__tests__/device/listFeatures.ts b/__tests__/device/listFeatures.ts
@@ -15,7 +15,7 @@ feature:two=two
 feature:three=false
 feature:four=true
 feature:five=null
-feature:six`,
+feature:six=`,
                     raw: true
                 }
             }

diff --git a/__tests__/device/listProperties.ts b/__tests__/device/listProperties.ts
@@ -10,13 +10,19 @@ describe('List properties tests', () => {
             {
                 cmd: 'shell:getprop',
                 res: {
-                    value: `[one]: [1]
+                    value: `[one]: [int]
+[two]: [string]
+[three]: [bool]
+[four]: [bool]
+[five]: [string]
+[six]: [string]
+[one]: [1]
 [two]: [two]
 [three]: [false]
 [four]: [true]
 [five]: [null]
 [six]: []
-[seven]: [Sun Jul 17 2022 21:11:48 GMT+0200 (Central European Summer Time)]`,
+`,
                     raw: true
                 }
             }
@@ -40,14 +46,8 @@ describe('List properties tests', () => {
                     ['two', 'two'],
                     ['three', false],
                     ['four', true],
-                    ['five', null],
-                    ['six', undefined],
-                    [
-                        'seven',
-                        new Date(
-                            'Sun Jul 17 2022 21:11:48 GMT+0200 (Central European Summer Time)'
-                        )
-                    ]
+                    ['five', 'null'],
+                    ['six', '']
                 ])
             );
         } finally {

diff --git a/__tests__/device/listSettings.ts b/__tests__/device/listSettings.ts
@@ -14,8 +14,7 @@ two="two"
 three=false
 four=true
 five=null
-six=
-seven=Sun Jul 17 2022 21:11:48 GMT+0200 (Central European Summer Time)`,
+six=`,
                     raw: true
                 }
             }
@@ -30,13 +29,7 @@ seven=Sun Jul 17 2022 21:11:48 GMT+0200 (Central European Summer Time)`,
                     ['three', false],
                     ['four', true],
                     ['five', null],
-                    ['six', undefined],
-                    [
-                        'seven',
-                        new Date(
-                            'Sun Jul 17 2022 21:11:48 GMT+0200 (Central European Summer Time)'
-                        )
-                    ]
+                    ['six', undefined]
                 ])
             );
         } finally {

diff --git a/__tests__/util.ts b/__tests__/util.ts
@@ -91,17 +91,6 @@ describe('String to type', () => {
         const result = stringToType('[]');
         expect(result).toBe('[]');
     });
-
-    it('Cast string date as Date', () => {
-        const result = stringToType('Mon Dec 20 15:05:47 UTC 2021');
-        expect(result).toEqual(new Date('Mon Dec 20 15:05:47 UTC 2021'));
-    });
-
-    it('Cast iso date as Date', () => {
-        const date = new Date();
-        const result = stringToType(date.toISOString());
-        expect(result).toEqual(date);
-    });
 });
 
 describe('Parse primitive type', () => {
@@ -125,8 +114,7 @@ describe('Find matches', () => {
 [four]: [true]
 [five]: [null]
 [six]: [[]]
-[seven]: [Sun Jul 17 2022 21:11:48 GMT+0200 (Central European Summer Time)]
-[eight]: []`,
+[seven]: []`,
             /^\[([\s\S]*?)\]: \[([\s\S]*?)\]?$/gm
         );
         expect(result).toEqual([
@@ -136,11 +124,7 @@ describe('Find matches', () => {
             ['four', 'true'],
             ['five', 'null'],
             ['six', '[]'],
-            [
-                'seven',
-                'Sun Jul 17 2022 21:11:48 GMT+0200 (Central European Summer Time)'
-            ],
-            ['eight', '']
+            ['seven', '']
         ]);
     });
 
@@ -152,8 +136,7 @@ describe('Find matches', () => {
 [four]: [true]
 [five]: [null]
 [six]: [[]]
-[seven]: [Sun Jul 17 2022 21:11:48 GMT+0200 (Central European Summer Time)]
-[eight]: []`,
+[seven]: []`,
             /^\[([\s\S]*?)\]: \[([\s\S]*?)\]?$/gm,
             'map'
         );
@@ -165,13 +148,7 @@ describe('Find matches', () => {
                 ['four', true],
                 ['five', null],
                 ['six', '[]'],
-                [
-                    'seven',
-                    new Date(
-                        'Sun Jul 17 2022 21:11:48 GMT+0200 (Central European Summer Time)'
-                    )
-                ],
-                ['eight', undefined]
+                ['seven', undefined]
             ])
         );
     });
@@ -184,8 +161,7 @@ describe('Find matches', () => {
 [four]: [true]
 [five]: [null]
 [six]: [[]]
-[seven]: [Sun Jul 17 2022 21:11:48 GMT+0200 (Central European Summer Time)]
-[eight]: []`,
+[seven]: []`,
             /^\[([\s\S]*?)\]: \[([\s\S]*?)\]?$/gm,
             'list'
         );
@@ -196,8 +172,7 @@ describe('Find matches', () => {
             'four',
             'five',
             'six',
-            'seven',
-            'eight'
+            'seven'
         ]);
     });
 });

diff --git a/src/commands/host-transport/listproperties.ts b/src/commands/host-transport/listproperties.ts
@@ -1,11 +1,39 @@
-import { findMatches } from '../../util';
-import { PropertyMap } from '../../util';
+import { findMatches, ListPropertiesMap } from '../../util';
 import TransportParseAllCommand from '../abstract/transportParseAll';
 
-export default class ListPropertiesCommand extends TransportParseAllCommand<PropertyMap> {
-    protected Cmd = 'shell:getprop';
+const valueParser = (
+    type: string | undefined,
+    value: string
+): string | boolean | number => {
+    switch (type) {
+        case 'bool':
+        case 'int':
+            try {
+                return JSON.parse(value);
+            } catch {
+                return value;
+            }
+        default:
+            return value;
+    }
+};
+
+export default class ListPropertiesCommand extends TransportParseAllCommand<ListPropertiesMap> {
+    protected Cmd = 'shell:getprop -T && getprop';
 
-    protected parse(value: string): PropertyMap {
-        return findMatches(value, /^\[([\s\S]*?)\]: \[([\s\S]*?)\]?$/gm, 'map');
+    protected parse(value: string): ListPropertiesMap {
+        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)
+                ])
+        );
     }
 }
diff --git a/src/util/functions.ts b/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;
     }
 };