Electron vite built : first working (building) version

electron_vite/electron-builder.yml

@@ -2,7 +2,6 @@ appId: org.accessmod.desktop
 productName: AccessMod Desktop
 directories:
   buildResources: build
-lib:
 files:
   - '!**/.vscode/*'
   - '!src/*'
@@ -14,6 +13,7 @@ asarUnpack:
   - resources/**
 win:
   executableName: AccessMod Desktop
+  icon: build/icon.png
 nsis:
   artifactName: ${name}-${version}-setup.${ext}
   shortcutName: ${productName}
@@ -27,6 +27,7 @@ mac:
   notarize: false
   category: public.app-category.education  
   type: development
+  icon: build/icon.png
 dmg:
   artifactName: ${name}-${version}.${ext}
 linux:
@@ -36,6 +37,7 @@ linux:
     - deb
   maintainer: accessmod.org
   category: Utility
+  icon: build/icon.png
 appImage:
   artifactName: ${name}-${version}.${ext}
 npmRebuild: false

electron_vite/package.json

@@ -1,9 +1,9 @@
 {
   "name": "accessmod-desktop",
-  "version": "5.8.1",
+  "version": "5.8.2",
   "description": "AccessMod Desktop : manage accessmod docker images, data and versions.",
   "main": "./out/main/index.js",
-  "author": "Fred Moser",
+  "author": "accessmod.org",
   "license": "MIT",
   "type": "module",
   "keywords": [

electron_vite/src/main/fetch.js

@@ -0,0 +1,38 @@
+import fetch from "node-fetch";
+
+const cache = {};
+
+/**
+ * Fetches data from a URL with caching capability.
+ * If cached data is available and not expired, it returns the cached data.
+ * Otherwise, it fetches from the network, caches the new data, and returns it.
+ *
+ * @param {string} url - The URL to fetch the data from.
+ * @param {number} ttl - Time to live for the cache in seconds.
+ * @returns {Promise<any>} The fetched data.
+ */
+export async function fetchCacheData(url, ttl) {
+  const now = Date.now();
+  const item = cache[url];
+
+  // Check if item exists and is still valid
+  if (item && item.expires > now) {
+    return item.data;
+  }
+
+  // If the item is expired or doesn't exist, fetch new data
+  const res = await fetch(url);
+  if (!res.ok) {
+    throw new Error(
+      `HTTP error while fetching data. Status: ${res.status} - ${res.statusText}`
+    );
+  }
+
+  const data = await res.json();
+  const expires = now + ttl * 1000; // Calculate the expiration time
+
+  // Cache the new data with expiration time
+  cache[url] = { data, expires };
+
+  return data;
+}

electron_vite/src/main/modules/controller/index.js

@@ -268,7 +268,6 @@ export class Controller extends Classes([
         versionsAdd: true,
         versionsForceFetch: true,
       });
-      debugger;
 
       /**
        * Test if docker image exists

electron_vite/src/main/modules/versions/index.js

@@ -1,6 +1,6 @@
 import semver from "semver";
-import fetch from "node-fetch";
 import { dialog } from "electron";
+import { fetchCacheData } from "../../fetch";
 
 const cache = {
   list_local: [],
@@ -33,7 +33,6 @@ export class Versions {
     const vrs = this;
     const ctr = vrs._ctr;
     const sum = await vrs.summary(force);
-    debugger;
     const out = [];
 
     // has update
@@ -171,10 +170,7 @@ export class Versions {
       const nRes = 100;
       const pNum = 1;
       const url = `${rUrl}/repositories/${rName}/tags/?page_size=${nRes}&page=${pNum}`;
-      debugger;
-      const res = await fetch(url);
-      debugger;
-      const data = await res.json();
+      const data = await fetchCacheData(url, 60 * 30);
       const versions = vrs.filterValid(data.results.map((r) => r.name));
 
       if (versions.length > 0) {
@@ -211,7 +207,6 @@ export class Versions {
   async listLocal() {
     const vrs = this;
     const rTag = await vrs.listRepoTags();
-    debugger;
     return vrs.filterValid(rTag.map((r) => r.split(":")[1]));
   }
 
@@ -364,17 +359,32 @@ export class Versions {
 
     ref[image_name] = true;
 
-    debugger;
-    const ii = await ctr._docker.listImages();
-
-    debugger;
-
     const imgs = await ctr._docker.listImages({
       filters: {
         reference: ref,
       },
-    });  
-    debugger;
+    });
+
+    /**
+     *     {
+     *     "Containers": -1,
+     *     "Created": 1705928421,
+     *     "Id": "sha256:d317c1318293e7e31935282877a42473783dfa071385f9fe4df85be9adcf5b45",
+     *     "Labels": {
+     *         "maintainer": "email>"
+     *     },
+     *     "ParentId": "",
+     *     "RepoDigests": [
+     *         "fredmoser/accessmod@sha256:1113c8266f88e58b535a9ed9efff57e077749c8c62c33081efd33b0b55ad8e4b"
+     *     ],
+     *     "RepoTags": [
+     *         "fredmoser/accessmod:5.8.2-alpha.2"
+     *     ],
+     *     "SharedSize": -1,
+     *     "Size": 432105534
+     * }
+     */
+
     return imgs;
   }