Some changes to the Properties system

README.md

@@ -29,6 +29,14 @@ Introducing Magisk Module Repo Loader (MMRL) - the ultimate module manager for M
 - [x] Magisk Delta
 - [x] KernelSU
 
+## Retive configs
+
+```shell
+function getconf {
+  /system/bin/getprop "$1" "$2" | sed 's/"//g'
+}
+```
+
 ## Screenshots
 
 <table>

Website/src/hooks/useModConf.tsx

@@ -1,11 +1,7 @@
 import React, { createContext, useContext } from "react";
-import { colors as kolors } from "@mui/material";
 import { defaultComposer } from "default-composer";
 import { useNativeStorage } from "./useNativeStorage";
-import { os } from "@Native/Os";
 import { SetStateAction } from "./useStateCallback";
-import { useLanguageMap } from "./../locales/declaration";
-import { useLocalForage } from "./useLocalForage";
 
 export interface ModConf {
   //cli

Website/src/hooks/useNativeProperties.tsx

@@ -8,7 +8,8 @@ import { os } from "@Native/Os";
 import { Dispatch, SetStateAction, useStateCallback } from "./useStateCallback";
 import { useLog } from "./native/useLog";
 import { Shell } from "@Native/Shell";
-import { useNativeStorage } from "./useNativeStorage";
+import { parseJSON, useNativeStorage } from "./useNativeStorage";
+import { Properties } from "@Native/Properties";
 
 declare global {
   interface WindowEventMap {
@@ -18,80 +19,51 @@ declare global {
 
 export type SetValue<T> = Dispatch<SetStateAction<T>, T>;
 
-export const nativeProperties = {
-  setItem(key: str, val: str): void {
-    Shell.cmd(`setprop "${key}" "${val}"`).exec();
-  },
-  getItem(key: str, initialValue: str): string | "" {
-    return window.__properties__.get(key, initialValue);
-  },
-};
-
-if (window.__nativeStorage__) {
-  window.__nativeStorage__.defineName("localstorage");
-}
-
-/**
- * Fallback for playground
- * @returns
- */
-export function useNativeProperties(key: string, initialValue: str): [str, SetValue<str>] {
-  if (os.isAndroid) {
-    return __useProperties(key, initialValue);
+function convertToProperType(value: string) {
+  if (/^(true|1|y|yes|on)$/i.test(value)) {
+    return /^(true|1|y|yes|on)$/i.test(value); // Convert to boolean true
+  } else if (!isNaN(value as unknown as number)) {
+    return parseFloat(value); // Convert to number if it's a valid number
   } else {
-    return useNativeStorage<str>(key, initialValue);
+    return value; // Return the original string if no conversion is possible
   }
 }
 
-function __useProperties(key: string, initialValue: str): [str, SetValue<str>] {
+export function useNativeProperties(
+  key: string,
+  initialValue: string | boolean | number
+): [string | boolean | number, SetValue<string | boolean | number>] {
   const log = useLog("useNativeProperties");
-  // Get from local storage then
-
-  // parse stored json or return initialValue
 
-  const readValue = useCallback((): str => {
+  const readValue = useCallback((): string | boolean | number => {
     // Prevent build error "window is undefined" but keeps working
 
     if (typeof window === "undefined") {
       return initialValue;
     }
 
-    return nativeProperties.getItem(key, initialValue);
-  }, [initialValue, key]);
-
-  // State to store our value
-
-  // Pass initial state function to useState so logic is only executed once
-
-  const [storedValue, setStoredValue] = useStateCallback<str>(readValue);
+    try {
+      const item = Properties.get(key, String(initialValue));
 
-  // Return a wrapped version of useState's setter function that ...
+      return item ? (parseJSON(item) as string | boolean | number) : initialValue;
+    } catch (error) {
+      log.w(`Error reading nativeStorage key “${key}”: ${error}`);
 
-  // ... persists the new value to localStorage.
+      return initialValue;
+    }
+  }, [initialValue, key]);
 
-  const setValue: SetValue<str> = (value, callback) => {
-    // Prevent build error "window is undefined" but keeps working
+  const [storedValue, setStoredValue] = useStateCallback<string | boolean | number>(readValue);
 
+  const setValue: SetValue<string | boolean | number> = (value, callback) => {
     if (typeof window === "undefined") {
       log.w(`Tried setting nativeProperties key “${key}” even though environment is not a client`);
     }
 
     try {
-      // Allow value to be a function so we have the same API as useState
-
       const newValue = value instanceof Function ? value(storedValue) : value;
-
-      // Save to local storage
-
-      nativeProperties.setItem(key, JSON.stringify(newValue));
-
-      // Save state
-
+      Properties.set(key, JSON.stringify(newValue));
       setStoredValue(newValue, callback);
-
-      // We dispatch a custom event so every useLocalStorage hook are notified
-
-      // window.dispatchEvent(new Event("local-storage"));
     } catch (error) {
       log.w(`Error setting localStorage key “${key}”: ${error}`);
     }
@@ -101,39 +73,5 @@ function __useProperties(key: string, initialValue: str): [str, SetValue<str>] {
     setStoredValue(readValue());
   }, []);
 
-  // const handleStorageChange = useCallback(
-  //   (event: StorageEvent | CustomEvent) => {
-  //     if ((event as StorageEvent)?.key && (event as StorageEvent).key !== key) {
-  //       return;
-  //     }
-
-  //     setStoredValue(readValue());
-  //   },
-
-  //   [key, readValue]
-  // );
-
-  // // this only works for other documents, not the current one
-
-  // useEventListener("storage", handleStorageChange);
-
-  // // this is a custom event, triggered in writeValueToLocalStorage
-
-  // // See: useLocalStorage()
-
-  // useEventListener("native-storage", handleStorageChange);
-
   return [storedValue, setValue];
 }
-
-// A wrapper for "JSON.parse()"" to support "undefined" value
-
-function parseJSON<T>(value: string | null): T | Error {
-  try {
-    return value === "undefined" ? undefined : JSON.parse(value ?? "");
-  } catch (e) {
-    console.log("parsing error on", { value });
-
-    return e as Error;
-  }
-}

Website/src/hooks/useNativeStorage.tsx

@@ -111,7 +111,7 @@ export function useNativeStorage<T>(key: string, initialValue: T): [T, SetValue<
 
 // A wrapper for "JSON.parse()"" to support "undefined" value
 
-function parseJSON<T>(value: string | null): T | Error {
+export function parseJSON<T>(value: string | null): T | Error {
   try {
     return value === "undefined" ? undefined : JSON.parse(value ?? "");
   } catch (e) {

Website/src/hooks/useRepos.tsx

@@ -7,7 +7,6 @@ import _ from "underscore";
 import { useSettings } from "./useSettings";
 import { os } from "@Native/Os";
 import { useLog } from "./native/useLog";
-import { useLocalForage } from "./useLocalForage";
 
 export interface RepoContextActions {
   addRepo: (data: AddRepoData) => void;

Website/src/index.tsx

@@ -22,10 +22,6 @@ import { strs } from "./locales/declaration";
 ons.platform.select("android");
 
 ons.ready(() => {
-  if (window.__nativeStorage__) {
-    window.__nativeStorage__.defineName("localstorage");
-  }
-
   customElements.define("mmrl-app", MMRLApp);
   customElements.define("mmrl-anchor", MMRLAnchor);
 

Website/src/native/Native.ts

@@ -16,7 +16,6 @@ export class Native<I = any> implements INative<I> {
    * @required true
    */
   public constructor(i: I) {
-    if (typeof i === "undefined") throw new Error("No interface defined");
     this._internal_interface = i;
   }
 

Website/src/native/Properties.ts

@@ -15,13 +15,15 @@ class PropertiesClass extends Native<IProperties> {
     if (this.isAndroid) {
       return this.interface.get(key, def);
     } else {
-      return "";
+      return window.localStorage.getItem(key) || def;
     }
   }
 
   public set(key: string, value: string): void {
     if (this.isAndroid) {
       Shell.cmd(`setprop "${key}" "${value}"`).exec();
+    } else {
+      return window.localStorage.setItem(key, value);
     }
   }
 }

Website/src/typings/global.d.ts

@@ -42,6 +42,10 @@ declare global {
     }
   }
 
+  interface NativeStorage extends Storage {
+    getItem(key: string, def?: string): string;
+  }
+
   /**
    * Native window properties for Android
    */
@@ -74,7 +78,7 @@ declare global {
      *
      * - This interface is not configurable
      */
-    readonly __nativeStorage__: Pick<Storage, "getItem" | "setItem" | "removeItem" | "clear"> & { defineName: (name: string) => void };
+    readonly __nativeStorage__: NativeStorage;
   }
 
   namespace Terminal {
@@ -101,7 +105,9 @@ declare global {
     export function getFile(type: string, successCallback: SuccessCallback, ErrorCallback: ErrorCallback): any;
   }
 
-  interface Window extends AndroidWindow<any> {}
+  interface Window extends AndroidWindow<any> {
+    localStorage: NativeStorage;
+  }
 
   const Toast: {
     LENGTH_LONG: "long";