Reduce idle cpu workload of ahqstore_service to mere 3% at max and 0.…

…7% at min

src-service/src/handlers/service/windows/exe/pipe.rs

@@ -74,7 +74,7 @@ pub fn launch() -> impl Future<Output = ()> {
   async move {
     start_exe_daemon().await;
     loop {
-      write_log("[EXE]: Loop");
+      println!("[EXE]: Loop");
 
       if let Ok(()) = pipe.connect().await {
         unsafe { CONNECTED = true };
@@ -124,10 +124,17 @@ pub fn launch() -> impl Future<Output = ()> {
           continue;
         }
 
+        let mut count: u8 = 0;
+
         'a: loop {
-          if !is_current_logged_in_user(process_id as usize) {
-            let _ = pipe.disconnect();
-            break 'a;
+          count += 1;
+
+          if count >= 30 {
+            if !is_current_logged_in_user(process_id as usize) {
+              let _ = pipe.disconnect();
+              break 'a;
+            }
+            count = 0;
           }
 
           match read_msg(pipe).await {
@@ -140,7 +147,7 @@ pub fn launch() -> impl Future<Output = ()> {
             }
             _ => {}
           }
-          tokio::time::sleep(Duration::from_nanos(10)).await;
+          tokio::time::sleep(Duration::from_millis(10)).await;
         }
       }
       unsafe {
@@ -189,7 +196,6 @@ pub async fn read_msg(pipe: &mut NamedPipeServer) -> ReadResponse {
             e => {
               let err = format!("{e:?}");
 
-              write_log(&err);
               if &err != "Uncategorized" {
                 let _ = pipe.disconnect();
                 return ReadResponse::Disconnect;

src-service/src/ipc/win32.rs

@@ -104,7 +104,7 @@ pub async fn launch() {
           //let mut buf: Box<[u8]>;
 
           ext += 1;
-          if ext >= 10 {
+          if ext >= 200 {
             ext = 0;
             let (auth, _, _) = authenticate_process(process_id as usize, false);
 

src/app/apps/components/app_card.tsx

@@ -68,7 +68,7 @@ export default function AppCard(props: {
       getResource(props.id, "0")
         .then(setIcon)
         .catch((e) => {
-          console.log(e);
+          console.warn(e);
           setIcon("/package.png");
         });
     })();

src/app/apps/components/app_modal.tsx

@@ -117,10 +117,8 @@ export default function ShowModal(props: AppDataPropsModal) {
 
   useEffect(() => {
     const id = worker.listen((lib, update) => {
-      console.log("Get");
       setUpdating(update != "UpToDate" && update != "Disabled");
 
-      console.log(installData);
       const entry = lib.find((d) => d.app_id == installData);
 
       try {
@@ -161,7 +159,6 @@ export default function ShowModal(props: AppDataPropsModal) {
     });
 
     return () => {
-      console.log("Unlistening");
       worker.unlisten(id)
     };
   }, [installData]);

src/app/developer/index.tsx

@@ -39,15 +39,11 @@ export default function Developers(props: DevProps) {
         if (uid) {
           const hash = await generateGHUserHash(uid).catch(() => "");
 
-          console.log("Hash ", hash);
-
           const apps = await get_devs_apps(
             hash,
           );
 
-          console.log(apps);
           fetchApps(apps).then((apps) => {
-            console.log(apps);
             setPublishedApps(apps as appData[]);
           });
         }

src/app/library/components/AppsList.tsx

@@ -21,37 +21,52 @@ export default function AppsList(props: Props) {
   const [rawApps, setRawApps] = useState(0);
 
   async function parseAppsData() {
-    const apps = await listAllApps();
-    if (Object.keys(apps).length === 0) {
-      setRawApps(1);
-    }
-    const resolvedApps = await fetchApps(Object.keys(apps));
-    const icons = await Promise.all(
-      (resolvedApps as appData[]).map((x) => getResource(x.appId, "0")),
-    );
+    try {
+      const apps = await listAllApps();
+
+      const appsKeys: string[] = Object.keys(apps);
+
+      const resolvedApps = await fetchApps(appsKeys) as appData[];
 
-    setIcons(icons);
-    setApps(resolvedApps as appData[]);
+      const icons = await Promise.all(
+        resolvedApps.map((x) => {
+          if (x.appId.includes("winget_app_super_unknown_")) {
+            return "/package.png";
+          } else {
+            return getResource(x.appId, "0");
+          }
+        }),
+      );
+
+      setIcons(icons);
+
+      if (Object.keys(apps).length === 0) {
+        setRawApps(1);
+      }
+      setApps(resolvedApps);
+    } catch (e) {
+      console.error(e);
+      setRawApps(2);
+    }
   }
 
   useEffect(() => {
     parseAppsData();
-    const timeout = setInterval(() => parseAppsData(), 5000);
+    const timeout = setInterval(() => parseAppsData(), 10_000);
 
     return () => clearInterval(timeout);
   }, []);
 
   return (
     <div className="flex flex-col w-[98%] h-[100%] mx-auto">
       <div className="min-h-[auto] h-[100%] min-w-[100%] pb-[1rem] text-center">
-        {rawApps === 1 ? (
+        {(rawApps === 1 || rawApps === 2) ? (
           <h1
             className={`my-2 w-[100%] flex flex-row text-center items-center justify-center ${
               dark ? "text-slate-400" : "text-slate-700"
             }`}
           >
-            Install some apps to get the fun started{" "}
-            <GiPartyPopper size="1.5em" />
+            {rawApps === 1 ? <> Install some apps to get the fun started{" "} <GiPartyPopper size="1.5em" /></> : <>Something went wrong! ⚠️</>}
           </h1>
         ) : apps.length === 0 ? (
           <h1

src/app/resources/api/fetchApps.ts

@@ -23,7 +23,7 @@ export default async function fetchApps(
   if (typeof apps === "string") {
     return (await resolveApps([apps]))[0];
   } else if (Array.isArray(apps)) {
-    return await resolveApps([...apps]);
+    return await resolveApps(apps);
   } else {
     return [];
   }
@@ -65,7 +65,10 @@ export async function fetchAuthor(uid: string) {
 async function resolveApps(apps: string[]): Promise<appData[]> {
   let promises: Promise<appData>[] = [];
 
-  console.log(apps.find((s) => s == undefined));
+  if (apps == undefined) {
+    return [];
+  }
+
   apps.forEach((appId) => {
     if (appId != undefined) {
       if (cache[appId]) {
@@ -77,7 +80,32 @@ async function resolveApps(apps: string[]): Promise<appData[]> {
       } else {
         promises.push(
           (async () => {
-            const app = await get_app(appId);
+            const app = await get_app(appId).catch((e) => {
+              console.warn("Failed to get app", appId, e);
+              return {
+                appDisplayName: "Unknown",
+                appId: `winget_app_super_unknown_${Math.random() * 2054568120}`,
+                authorId: "",
+                description: "This application has been removed or app id changed",
+                downloadUrls: [],
+                license_or_tos: "",
+                releaseTagName: "",
+                site: "",
+                source: "",
+                appShortcutName: "Unknown",
+                displayImages: [],
+                install: {
+                  free: () => { },
+                },
+                repo: {
+                  author: "", repo: "",
+                  free: () => { },
+                },
+                verified: false,
+                resources: {},
+                version: "none"
+              } as ApplicationData;
+            });
 
             const appData = {
               ...app,

src/app/resources/core/handler.ts

@@ -117,7 +117,6 @@ appWindow.listen<string[]>("ws_resp", async ({ payload: pload }) => {
             resolve(toObj);
           }
           if (toObj.method == "TerminateBlock" && ref_id != 0) {
-            console.log("Removing ", ref_id);
             return false;
           }
 
@@ -126,8 +125,8 @@ appWindow.listen<string[]>("ws_resp", async ({ payload: pload }) => {
       }
 
     } catch (e) {
-      console.log(pload);
-      console.log(e);
+      console.warn(pload);
+      console.warn(e);
     }
   }
 });

src/app/resources/core/index.ts

@@ -31,7 +31,7 @@ export function get_sha() {
     sendWsRequest(WebSocketMessage.GetSha(), (val) => {
       if (val.method == "SHAId") {
         const sha = val.data as string;
-        console.log(sha);
+
         invoke("set_commit", {
           commit: sha
         });

src/app/resources/utilities/preferences.ts

@@ -30,7 +30,7 @@ export default async function fetchPrefs(): Promise<appData> {
   mkdir("database", { baseDir: BaseDirectory.AppData }).catch((e) => e);
 
   const is_admin = await invoke<boolean>("is_an_admin").catch((e) => {
-    console.log(e);
+    console.warn(e);
 
     return true;
   });

src/index.tsx

@@ -130,7 +130,7 @@ if ((window as { __TAURI_INTERNALS__?: string }).__TAURI_INTERNALS__ == null) {
         document.querySelector("html")?.setAttribute("data-os", "win32");
       }
       setTimeout(async () => {
-        appWindow.setDecorations(true).catch(console.log);
+        appWindow.setDecorations(true).catch(console.warn);
 
         appWindow.show();
         if (!(await appWindow.isMaximized())) {