Immutable appdata (#445)

* moved all to the bundle, no appdata

* version up

* fixed dependencies, removed appData references

* addData dir

* removed depricated

* logger fix

* deps list

* readFileSync

* wljs packages paths

* qfixes

* home

* linux test

* set -eux

* fix

* fix

* header fixes

* removed handler

* trailling

* qfix nginx

* no waiting tunnel

* last attempt

* rm

* readme update

* store_config_in_docs

* macos-latest

Author: JerryI

.github/workflows/container-publish.yml

@@ -48,7 +48,7 @@ jobs:
       - name: Fetch all dependencies inside Wolfram container
         run: |
           docker exec -e WOLFRAMSCRIPT_ENTITLEMENTID=${{ secrets.WOLFRAM_LICENSE_ENTITLEMENT_ID }} wolfram \
-          wolframscript -script ./Scripts/update.wls
+          wolframscript -script ./Scripts/bundle.wls
 
       - name: Extract Docker metadata
         id: meta

.github/workflows/server-windows.yml

@@ -8,7 +8,7 @@ on: workflow_dispatch
 
 jobs:
   autotest:
-    runs-on: macos-14
+    runs-on: macos-latest
     env:
       WOLFRAM_SYSTEM_ID: MacOSX-ARM
       WOLFRAMENGINE_CACHE_KEY: WolframEngine-B

.github/workflows/test-update.yml

@@ -8,7 +8,7 @@ on: workflow_dispatch
 
 jobs:
   autotest:
-    runs-on: macos-14
+    runs-on: macos-latest
     env:
       WOLFRAM_SYSTEM_ID: MacOSX-ARM
       WOLFRAMENGINE_CACHE_KEY: WolframEngine-B

.github/workflows/test.yml

@@ -3,6 +3,7 @@ Temp/
 __backups/*.wln
 __ntemp/*.wln
 __localkernel/*
+__shared
 _settings.wl
 shipped/*
 *.DS_STORE

.gitignore

@@ -1,15 +1,13 @@
 BeginPackage["JerryI`LPM`"]
 
-PacletRepositories::usage = "PacletRepositories[{Github -> \"URL to the repo\", ...}] specify the wolfram packages to be synced via remote url"
-Github::usage = "internal name to specify the source of the package"
+PacletRepositories::usage = "depricated"
+LPMRepositories::usage = "LPMRepositories[{\"Github\" -> \"URL to the repo\", ...}] specify the wolfram packages to be synced via remote url"
+LPMLoad::usage = ""
+Github::usage = "depricated"
 
 
 Begin["`Private`"]
 
-System`$Env;
-electronConfirmed = System`$Env["ElectronCode"] === 1;
-
-JerryI`LPM`Private`Version = 15
 pacletDirectoryLoad = PacletDirectoryLoad
 
 urlImport = Import;
@@ -38,6 +36,10 @@ inspectPackages[dir_String, cbk_] := Module[{
   ] &/@ packages;
 ]
 
+LPMRepositories = PacletRepositories;
+
+LPMLoad[projectDir_String] := If[FileExistsQ[FileNameJoin[{projectDir, "wl_packages"}] ], Map[pacletDirectoryLoad] @  Map[DirectoryName] @  DeleteDuplicatesBy[FileNames["PacletInfo.wl" | "PacletInfo.m", {#}, {2}], DirectoryName]& @ FileNameJoin[{projectDir, "wl_packages"}], $Failed];
+
 PacletRepositories[list_List, OptionsPattern[]] := Module[{projectDir, strictMode = OptionValue["StrictMode"], info, repos, cache, updated, removed, new, current, updatable, skipUpdates = OptionValue["Passive"], automaticUpdates = OptionValue["AutomaticUpdates"], versionControl, maxVersionDiff = OptionValue["MaxVersionDiff"]},
     (* making key-values pairs *)
     repos = (#-><|"key"->#|>)&/@list // Association;
@@ -63,6 +65,10 @@ PacletRepositories[list_List, OptionsPattern[]] := Module[{projectDir, strictMod
         If[Now - time < OptionValue["UpdateInterval"] || strictMode,
           skipUpdates = True;
 
+          With[{c = CacheLoad[projectDir]}, If[AssociationQ[c] && !TrueQ[strictMode], 
+            If[Length[Complement[Keys[repos], Keys[c] ] ] > 0, skipUpdates = False];
+          ] ];
+          
         ];
       ]
     ];
@@ -77,7 +83,6 @@ PacletRepositories[list_List, OptionsPattern[]] := Module[{projectDir, strictMod
     Echo["LPM >> fetching packages info"];
 
     If[FailureQ[ URLFetch["https://github.com"] ],
-      If[!electronConfirmed,
         Echo["LPM >> ERROR! no connection to github.com!"];
 
         If[!MissingQ[cache], 
@@ -89,12 +94,6 @@ PacletRepositories[list_List, OptionsPattern[]] := Module[{projectDir, strictMod
           Echo["LPM >> ERROR! no cache found ;()"];
           Abort[];
         ];
-      ,
-        Echo["LPM >> URLRead or proxy connection failed"];
-        Echo["@Electron, fetch me libraries"];
-        
-        Exit[-1];
-      ];
     ];
 
     (* fetching new information from Github for each repo in the list *)
@@ -132,7 +131,7 @@ PacletRepositories[list_List, OptionsPattern[]] := Module[{projectDir, strictMod
       If[automaticUpdates,
         updatable = Select[current, CheckUpdates];
       ,
-        Echo["LPM >> Automatic updates are suppressed by default since 2.7.6"];
+        Echo["LPM >> Automatic updates are suppressed by default"];
         updatable = <||>;
       ];
 
@@ -206,7 +205,7 @@ CheckUpdates[a_Association] := Module[{result},
 convertVersion[str_String] := ToExpression[StringReplace[str, "." -> ""]]
 
 (* general function work for both Releases & Branches *)
-CheckUpdates[a_Association, Rule[Github, _]] := Module[{package, new, now},
+CheckUpdates[a_Association, Rule[Github | "Github", _]] := Module[{package, new, now},
   (* fetch any *)
   package = FetchInfo[a];
   If[!AssociationQ[package], Echo["LPM >> cannot check. Skipping..."]; Return[False, Module]];
@@ -239,7 +238,7 @@ FetchInfo[a_Association] := Module[{result},
 ]
 
 (* for releases *)
-FetchInfo[a_Association, Rule[Github, url_String]] := Module[{new, data},
+FetchInfo[a_Association, Rule[Github | "Github", url_String]] := Module[{new, data},
   (* extracting from given url *)
   new = StringCases[url, RegularExpression[".com\\/(.*).git"]->"$1"]//First // Quiet;
     If[!StringQ[new], new = StringCases[url, RegularExpression[".com\\/(.*)"]->"$1"]//First];
@@ -252,15 +251,15 @@ FetchInfo[a_Association, Rule[Github, url_String]] := Module[{new, data},
   If[!StringQ[data["zipball_url"]],
     Print["Releases are not available. Taking a master branch"];
     (* TAKE MASTER Branch *)
-    Return[FetchInfo[a, Rule[Github, Rule[url, "master"]]]];
+    Return[FetchInfo[a, Rule["Github", Rule[url, "master"]]]];
   ];
 
   (* merge new and old data together *)
   Join[a, data, <|"git-url"->new|>]
 ]
 
 (* for branches *)
-FetchInfo[a_Association, Rule[Github, Rule[url_String, branch_String]]] :=
+FetchInfo[a_Association, Rule[Github | "Github", Rule[url_String, branch_String]]] :=
 Module[{new, data},
   (* extracting from given url *)    
     new = StringCases[url, RegularExpression[".com\\/(.*).git"]->"$1"]//First // Quiet;
@@ -290,15 +289,15 @@ Module[{new, data},
 InstallPaclet[dir_String][a_Association] := InstallPaclet[dir][a, a["key"]]
 
 (* releases *)
-InstallPaclet[dir_String][a_Association, Rule[Github, url_String]] := Module[{dirName, pacletPath},
+InstallPaclet[dir_String][a_Association, Rule[Github | "Github", url_String]] := Module[{dirName, pacletPath},
     dirName = FileNameJoin[{dir, "wl_packages"}];
     If[!FileExistsQ[dirName], CreateDirectory[dirName]];
 
     (* check if there is no data on releases -> *)
     If[MissingQ[a["zipball_url"]], 
       (* TAKE Master branch instead *)
       Echo["LPM >> Releases are not available. Taking a master branch"];
-      Return[InstallPaclet[dir][a, Rule[Github, Rule[url, "master"]]]];
+      Return[InstallPaclet[dir][a, Rule["Github", Rule[url, "master"]]]];
     ];
 
     (* make a name from the git url provided *)
@@ -336,7 +335,7 @@ InstallPaclet[dir_String][a_Association, Rule[Github, url_String]] := Module[{di
 ]
 
 (* for branch *)
-InstallPaclet[dir_String][a_Association, Rule[Github, Rule[url_String, branch_String]]] := Module[{dirName, pacletPath},
+InstallPaclet[dir_String][a_Association, Rule[Github | "Github", Rule[url_String, branch_String]]] := Module[{dirName, pacletPath},
     dirName = FileNameJoin[{dir, "wl_packages"}];
     If[!FileExistsQ[dirName], CreateDirectory[dirName]];
 
@@ -379,11 +378,11 @@ InstallPaclet[dir_String][a_Association, Rule[Github, Rule[url_String, branch_St
 RemovePaclet[dir_String][a_Association] := RemovePaclet[dir][a, a["key"]]
 
 (* releases *)
-RemovePaclet[dir_String][a_Association, Rule[Github, url_String]] := (
+RemovePaclet[dir_String][a_Association, Rule[Github | "Github", url_String]] := (
 
   If[MissingQ[a["zipball_url"]], 
     Echo["LPM >> Releases are not available. Removing master"];
-    Return[RemovePaclet[dir][a, Rule[Github, Rule[url, "master"]]]];
+    Return[RemovePaclet[dir][a, Rule["Github", Rule[url, "master"]]]];
   ];  
 
   dirName = FileNameJoin[{dir, "wl_packages"}];
@@ -402,7 +401,7 @@ RemovePaclet[dir_String][a_Association, Rule[Github, url_String]] := (
 )
 
 (* branches *)
-RemovePaclet[dir_String][a_Association, Rule[Github, Rule[url_String, branch_String]]] := Module[{dirName, pacletPath},
+RemovePaclet[dir_String][a_Association, Rule[Github | "Github", Rule[url_String, branch_String]]] := Module[{dirName, pacletPath},
     dirName = FileNameJoin[{dir, "wl_packages"}];
     dirName = FileNameJoin[{dirName, StringReplace[a["Name"], "/"->"_"]}];
 

Common/LPM/LPM.wl

@@ -57,15 +57,7 @@ Component[OptionsPattern[]] := With[{
         <button data-name="locateExamples" class="block w-full  text-black group flex items-center px-1 my-1 py-1 rounded text-sm leading-4 dark:text-gray-400" role="menuitem" tabindex="-1">
 
           Locate Examples
-        </button>
-        <button data-name="locateAppData" class="block w-full  text-black group flex items-center px-1 my-1 py-1 rounded text-sm leading-4 dark:text-gray-400" role="menuitem" tabindex="-1">
-   
-          Locate AppData
-        </button> 
-        <button data-name="checkupdates" class="block w-full  text-black group flex items-center px-1 my-1 py-1 rounded text-sm leading-4 dark:text-gray-400" role="menuitem" tabindex="-1">
-   
-          Check updates
-        </button>               
+        </button>              
       </div>
 
     ,  

Components/FakeMenu.wlx

@@ -35,11 +35,7 @@ With[{
         <button data-name="LocateExamples" class="block w-full  text-black group flex items-center px-1 my-1 py-1 rounded text-sm leading-4 dark:text-gray-400" role="menuitem" tabindex="-1">
 
           Locate examples
-        </button> 
-        <button data-name="CheckUpdates" class="block w-full  text-black group flex items-center px-1 my-1 py-1 rounded text-sm leading-4 dark:text-gray-400" role="menuitem" tabindex="-1">
-       
-          Check updates
-        </button>              
+        </button>             
       </div>
     ,
       <div class="py-0 px-2" role="none">       

Components/FakeMenuBrowser.wlx

@@ -2969,14 +2969,6 @@ const term = new xtermExports.Terminal({cursorBlink: true, rows: 13, fontFamily:
 
 const logger = document.getElementById('log');
 
-const logFile = document.getElementById('log_file');
-logFile.addEventListener('click', () => window.electronAPI.locateLogFile());
-
-const reinstall = document.getElementById('reinstall');
-reinstall.addEventListener('click', () => {
-    window.electronAPI.reinstall();
-    reinstall.remove();
-});
 
 // Open the terminal in #terminal-container
 term.open(logger);
@@ -3027,10 +3019,7 @@ debug.addEventListener('click', () => {
 
 const info = document.getElementById("modal_info");
 
-const installDir = document.getElementById('log_file');
-installDir.addEventListener('click', () => {
-    window.electronAPI.locateLogFile();
-});
+
 
 window.electronAPI.updateInfo((event, info) => {
     document.getElementById("modal_info_state").innerText = info;
@@ -3065,11 +3054,7 @@ window.electronAPI.addPromt((event, id, title) => {
     modal.classList.remove('hidden');
 });
 
-const updateBtn = document.getElementById("update_button");
-updateBtn.addEventListener('click', () => {
-    window.electronAPI.update();
-    updateBtn.remove();
-})
+
 
 
 window.electronAPI.addDialog((event, id, title) => {

Electron/bundle/log.js

@@ -23,9 +23,7 @@
 
             <div class="mt-2 w-full flex flex-row text-sm text-gray-500 dark:text-gray-300">
               <button id="debug_button" style="-webkit-app-region: no-drag;" class="inline-flex bg-gray-100/50 dark:bg-gray-600/50 text-xs items-center px-4 outline-gray-400 outline-offset-2 ring-1 text-gray-800 ring-inset ring-gray-300 dark:ring-gray-400 hover:outline outline-1 placeholder:text-gray-400 rounded-md dark:text-gray-400">Debug</button>
-              <button id="update_button" style="-webkit-app-region: no-drag; margin-left:0.5rem;" class="inline-flex bg-gray-100/50 dark:bg-gray-600/50 text-xs items-center px-4 outline-gray-400 outline-offset-2 ring-1 text-gray-800 ring-inset ring-gray-300 dark:ring-gray-400 hover:outline outline-1 placeholder:text-gray-400 rounded-md dark:text-gray-400">Update</button>
-              <button id="log_file" style="-webkit-app-region: no-drag;" class="ml-auto hover:underline text-blue-600 dark:text-blue-400 visited:text-purple-600"  >Installation directory</button>
-              <button id="reinstall" style="-webkit-app-region: no-drag;" class="ml-auto hover:underline text-blue-600 dark:text-blue-400 visited:text-purple-600"  >Reinstall</button>
+             
             </div>