LPM fixes, Let + minor changes (#401)

* Fixed LPM and added Let library

* minor fixes. Added Let

* Update package.json

* fix requests

* version warnings

Author: JerryI

Common/LPM/LPM.wl

@@ -23,7 +23,7 @@ convertVersion[any_PacletObject] := convertVersion[any["Version"]]
 inspectPackages[dir_String, cbk_] := Module[{ 
   packages
 },
-  packages = Get /@ FileNames["PacletInfo.wl", {dir}, {2}];
+  packages = Get /@ DeleteDuplicatesBy[FileNames["PacletInfo.wl" | "PacletInfo.m", {dir}, {2}], DirectoryName];
 
   With[{found = SortBy[PacletFind[#["Name"] ], convertVersion]},
 
@@ -56,8 +56,6 @@ PacletRepositories[list_List, OptionsPattern[]] := Module[{projectDir, info, rep
       CreateDirectory[projectDir, CreateIntermediateDirectories->True];
       If[!FileExistsQ[projectDir], Echo["LPM >> Cannot create project directory by path "<>projectDir<>" !!!"]; Abort[] ];
     ];
-
-    Echo["LPM >> project directory >> "<>projectDir];
 
 
     If[FileExistsQ[FileNameJoin[{projectDir, ".wl_timestamp"}] ] && !OptionValue["ForceUpdates"],
@@ -66,27 +64,26 @@ PacletRepositories[list_List, OptionsPattern[]] := Module[{projectDir, info, rep
           skipUpdates = True;
 
         ];
-        Echo[StringJoin["LPM >> updated last time >> ", time // TextString] ];
       ]
     ];
 
     (* PASSIVE mode :: skips all checks and just loads wl_package folder *)
     If[skipUpdates, 
       inspectPackages[FileNameJoin[{projectDir, "wl_packages"}], OptionValue["ConflictResolutionFunction"] ];
-      Map[pacletDirectoryLoad] @  Map[DirectoryName] @  FileNames["PacletInfo.wl", {#}, {2}]& @ FileNameJoin[{projectDir, "wl_packages"}];
+      Map[pacletDirectoryLoad] @  Map[DirectoryName] @  DeleteDuplicatesBy[FileNames["PacletInfo.wl" | "PacletInfo.m", {#}, {2}], DirectoryName]& @ FileNameJoin[{projectDir, "wl_packages"}];
       Return[Null, Module];
     ];
 
-    Echo["LPM >> fetching packages info..."];
+    Echo["LPM >> fetching packages info"];
 
     If[FailureQ[ URLFetch["https://github.com"] ],
       If[!electronConfirmed,
-        Echo["LPM >> ERROR! no internet connection to github.com!"];
+        Echo["LPM >> ERROR! no connection to github.com!"];
 
         If[!MissingQ[cache], 
           Echo["LPM >> using stored data"];
           inspectPackages[FileNameJoin[{projectDir, "wl_packages"}], OptionValue["ConflictResolutionFunction"] ];
-          Map[pacletDirectoryLoad] @  Map[DirectoryName] @  FileNames["PacletInfo.wl", {#}, {2}]& @ FileNameJoin[{projectDir, "wl_packages"}];
+          Map[pacletDirectoryLoad] @  Map[DirectoryName] @  DeleteDuplicatesBy[FileNames["PacletInfo.wl" | "PacletInfo.m", {#}, {2}], DirectoryName]& @ FileNameJoin[{projectDir, "wl_packages"}];
           Return[Null, Module];
         ,
           Echo["LPM >> ERROR! no cache found ;()"];
@@ -184,7 +181,7 @@ PacletRepositories[list_List, OptionsPattern[]] := Module[{projectDir, info, rep
 
     (* finally load dirs *)
     inspectPackages[FileNameJoin[{projectDir, "wl_packages"}], OptionValue["ConflictResolutionFunction"] ];
-    Map[pacletDirectoryLoad] @  Map[DirectoryName] @  FileNames["PacletInfo.wl", {#}, {2}]& @ FileNameJoin[{projectDir, "wl_packages"}];
+    Map[pacletDirectoryLoad] @  Map[DirectoryName] @  DeleteDuplicatesBy[FileNames["PacletInfo.wl" | "PacletInfo.m", {#}, {2}], DirectoryName]& @ FileNameJoin[{projectDir, "wl_packages"}];
 ]
 
 Options[PacletRepositories] = {"Directory"->None, "Passive"->False, "ForceUpdates" -> False, "AutomaticUpdates"->True, "MaxVersionDiff" -> None, "UpdateInterval" -> Quantity[14, "Days"], "ConflictResolutionFunction" -> Function[{conflicting, true}, 
@@ -212,7 +209,7 @@ convertVersion[str_String] := ToExpression[StringReplace[str, "." -> ""]]
 CheckUpdates[a_Association, Rule[Github, _]] := Module[{package, new, now},
   (* fetch any *)
   package = FetchInfo[a];
-  If[!AssociationQ[package], Echo["LPM >> cannot check the github! skipping..."]; Return[False, Module]];
+  If[!AssociationQ[package], Echo["LPM >> cannot check. Skipping..."]; Return[False, Module]];
 
   (* a feature on how we can detect on what we are looking at *)
   If[KeyExistsQ[package, "tag_name"],
@@ -246,14 +243,14 @@ FetchInfo[a_Association, Rule[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];
-    Echo["LPM >> fetching releases info for "<>new<>" on a Github..."];
+    Echo["LPM >> fetching releases info for "<>new<>" on Github..."];
 
   (* here we FETCH GITHUB API RESPONCE and use releases metadata *)
   data = urlImport["https://api.github.com/repos/"<>new<>"releases/latest", "JSON"] // Association // Quiet;
 
   (* if there is NO RELEASES *)
   If[!StringQ[data["zipball_url"]],
-    Print["Releases are not available for now... taking a master branch"];
+    Print["Releases are not available. Taking a master branch"];
     (* TAKE MASTER Branch *)
     Return[FetchInfo[a, Rule[Github, Rule[url, "master"]]]];
   ];
@@ -268,19 +265,25 @@ 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];
-    Echo["LPM >> fetching info for "<>new<>" on a Github..."];
+    Echo["LPM >> fetching info for "<>new<>" on Github..."];
 
     (* here we FETCH PACLETINFO.WL file and use its metadata *)
-    data = Check[urlGet["https://raw.githubusercontent.com/"<>new<>"/"<>ToLowerCase[branch]<>"/PacletInfo.wl"], $Failed];
-    
+    data = urlGet["https://raw.githubusercontent.com/"<>new<>"/"<>ToLowerCase[branch]<>"/PacletInfo.wl"] // Quiet;
+    If[!MatchQ[ToString[Head[data] ], "PacletObject" | "Paclet"], 
+      data = urlGet["https://raw.githubusercontent.com/"<>new<>"/"<>ToLowerCase[branch]<>"/PacletInfo.m"];
+    ];
+
     (* if failed. we just STOP *)
-    If[FailureQ[data],
+
+    If[!MatchQ[ToString[Head[data] ], "PacletObject" | "Paclet"], (* some issue with contexts *)
+      Echo["Failed"];
+      Echo[ToString[data, InputForm] ];
       Echo["LPM >> ERROR cannot get "<>new<>"!"];
       Echo["LPM >> Aborting"];
       Abort[];
     ];
 
-    Join[a, data//First, <|"git-url"->new|>]
+    Join[a, Switch[ToString[Head[data] ], "PacletObject", data//First, "Paclet", Association @ KeyValueMap[Function[{k,v}, ToString[k]->v], Association @@ data] ], <|"git-url"->new|>]
 ]
 
 (* general function *)
@@ -303,31 +306,31 @@ InstallPaclet[dir_String][a_Association, Rule[Github, url_String]] := Module[{di
 
     (* in a case of update, directory will probably be there.. cleaning it! *)
     If[FileExistsQ[dirName],
-        Echo["LPM >> package folder "<>dirName<>" already exists!"];
+        Echo["LPM >> package folder already exists!"];
         Echo["LPM >> purging..."];
         DeleteDirectory[dirName, DeleteContents -> True];
     ];
 
     (* download release *)
-    Echo["LPM >> fetching a release..."];    
+    Echo["LPM >> fetching a release"];    
     urlDownload[a["zipball_url"], FileNameJoin[{dir, "___temp.zip"}]];
 
     (* extract to temporary directory and copy *)
-    Echo["LPM >> extracting..."];
+    Echo["LPM >> extracting"];
     ExtractArchive[FileNameJoin[{dir, "___temp.zip"}], FileNameJoin[{dir, "___temp"}]];
     DeleteFile[FileNameJoin[{dir, "___temp.zip"}]];
 
     (* locate PacletInfo, if it is not there, this is very bad. *)
-    pacletPath = FileNames["PacletInfo.wl", FileNameJoin[{dir, "___temp"}], 2] // First;
+    pacletPath = FileNames["PacletInfo.wl" | "PacletInfo.m", FileNameJoin[{dir, "___temp"}], 2] // First;
 
     If[!FileExistsQ[pacletPath], Echo["LPM >> FAILED!!! to fetch by "<>ToString[pacletPath]]; Abort[]];
     pacletPath = DirectoryName[pacletPath];
 
-    Echo[StringTemplate["LPM >> copying... from `` to ``"][pacletPath, dirName]];
+    Echo[StringTemplate["LPM >> copying from `` to ``"][pacletPath, dirName]];
 
     CopyDirectory[pacletPath, dirName];
     DeleteDirectory[FileNameJoin[{dir, "___temp"}], DeleteContents -> True];
-    Print["LPM >> finished!"];
+    Print["LPM >> finished"];
 
     a
 ]
@@ -341,7 +344,7 @@ InstallPaclet[dir_String][a_Association, Rule[Github, Rule[url_String, branch_St
     If[MissingQ[a["git-url"]], Echo["LPM >> ERROR!!! not git-url was found"]; Abort[]];
 
     (* construct name of the folder *)
-    dirName = FileNameJoin[{dirName, StringReplace[a["Name"], "/"->"_"]}];
+    dirName = FileNameJoin[{dirName, StringReplace[Lookup[a, "Name", a[Name] ], "/"->"_"]}];
 
     If[FileExistsQ[dirName],
         Echo["LPM >> package folder "<>dirName<>" already exists!"];
@@ -353,20 +356,20 @@ InstallPaclet[dir_String][a_Association, Rule[Github, Rule[url_String, branch_St
     Echo["LPM >> fetching a zip archive from the master branch..."];    
     urlDownload["https://github.com/"<>a["git-url"]<>"/zipball/"<>ToLowerCase[branch], FileNameJoin[{dir, "___temp.zip"}]];
 
-    Echo["LPM >> extracting..."];
+    Echo["LPM >> extracting"];
     ExtractArchive[FileNameJoin[{dir, "___temp.zip"}], FileNameJoin[{dir, "___temp"}]];
     DeleteFile[FileNameJoin[{dir, "___temp.zip"}]];
 
-    pacletPath = FileNames["PacletInfo.wl", FileNameJoin[{dir, "___temp"}], 2] // First;
+    pacletPath = FileNames["PacletInfo.wl" | "PacletInfo.m", FileNameJoin[{dir, "___temp"}], 2] // First;
 
     If[!FileExistsQ[pacletPath], Echo["LPM >> FAILED!!! to fetch by "<>ToString[pacletPath]]; Abort[]];
     pacletPath = DirectoryName[pacletPath];
 
-    Echo[StringTemplate["LPM >> copying... from `` to ``"][pacletPath, dirName]];
+    Echo[StringTemplate["LPM >> copying from `` to ``"][pacletPath, dirName]];
 
     CopyDirectory[pacletPath, dirName];
     DeleteDirectory[FileNameJoin[{dir, "___temp"}], DeleteContents -> True];
-    Print["LPM >> finished!"];
+    Print["LPM >> finished"];
 
     a
 ]

Frontend/Downloader.wl

@@ -26,8 +26,31 @@ BeginPackage["CoffeeLiqueur`Notebook`HTTPDownLoader`", {
     handler["GET"][request_] := With[{path = URLDecode[request["Query", "path"] ], rangesString = Lookup[request["Headers"], "Range", False]},
         Echo["Downloader >> Get request"];
 
+        If[!FileExistsQ[path],
+            Echo["File: "<>path<>" does not exist"];
+                    <|
+                        "Code" -> 404, 
+                        "Headers" -> <|
+                            "Content-Length" -> 0,
+                            "Connection"-> "Keep-Alive"
+                        |>
+                    |>  // Return;                 
+        ];
+
         If[rangesString === False,
-            Return[ImportFile[path, "Base"->Nothing] ]
+
+            With[{file = ReadByteArray[path]},
+                    <|
+                        "Body" -> file,
+                        "Code" -> 200, 
+                        "Headers" -> <|
+                            "Content-Type" -> GetMIMEType[path], 
+                            "Content-Length" -> Length[file],
+                            "Connection"-> "Keep-Alive", 
+                            "Keep-Alive" -> "timeout=5, max=1000"
+                        |>
+                    |>  // Return;            
+            ];
         ];
 
         With[{

Kernel/Extensions.wl

@@ -39,7 +39,7 @@ Table[
 , {i, Select[Packages // Keys, (Packages[#, "enabled"] && KeyExistsQ[Packages[#, "wljs-meta"], param])&]}] // Flatten;
 
 
-Repositories[list_List, OptionsPattern[] ] := Module[{projectDir, info, repos, cache, updated, removed, new, current, updatable, skipUpdates = False, versionControl, maxVersionDiff = OptionValue["MaxVersionDiff"]},
+Repositories[list_List, OptionsPattern[] ] := Module[{projectDir, info, repos, cache, updated, removed, new, current, updatable, automaticUpdates = OptionValue["AutomaticUpdates"], skipUpdates = False, versionControl, maxVersionDiff = OptionValue["MaxVersionDiff"]},
     (* making key-values pairs *)
     repos = (#-><|"key"->#|>)&/@list // Association;
 
@@ -155,7 +155,10 @@ Repositories[list_List, OptionsPattern[] ] := Module[{projectDir, info, repos, c
         new = InstallPaclet[projectDir] /@ new;
 
         (* what must be updated *)
-        updatable = Select[current, CheckUpdates];
+        updatable = If[automaticUpdates, Select[current, CheckUpdates], 
+          Echo["WLJS Extensions >> Automatic updates were disabled by default since 2.5.6"];
+          {}
+        ];
         (* will be updated *)
         updated   = ((#->repos[#])&/@ Keys[updatable]) // Association;
 
@@ -212,7 +215,7 @@ Repositories[list_List, OptionsPattern[] ] := Module[{projectDir, info, repos, c
     $packages = sortPackages[$packages];
 ]
 
-Options[Repositories] = {"Directory"->Directory[], "ForceUpdates" -> False, "MaxVersionDiff" -> None, "UpdateInterval" -> Quantity[4, "Days"]}
+Options[Repositories] = {"Directory"->Directory[], "ForceUpdates" -> False, "MaxVersionDiff" -> None, "UpdateInterval" -> Quantity[4, "Days"], "AutomaticUpdates"->True}
 
 sortPackages[assoc_Association] := With[{},
     Map[

Kernel/LocalKernel.wl

@@ -273,6 +273,8 @@ start[k_LocalKernelObject] := Module[{link},
         LinkWrite[link, EnterTextPacket["<<JerryI`Misc`WLJS`Transport`"] ];
         LinkWrite[link, EnterTextPacket["<<KirillBelov`CSockets`EventsExtension`"] ];
         LinkWrite[link, EnterTextPacket["<<KirillBelov`LTP`Events`"] ];
+        LinkWrite[link, EnterTextPacket["<<LetWL`"] ];
+        
 
         (* unknown bug, doesn't work in initialization ... *)
         LinkWrite[link, EnterTextPacket["Unprotect[Interpretation, InterpretationBox]"] ];
@@ -312,6 +314,10 @@ checkState[k_LocalKernelObject] := Module[{},
     EventFire[k, "Error", "Timeout"];
 ]
 
+(* [NOTE] You may easily overload the evaluation que on Windows machines *)
+(* It will stall during LinkWrite *)
+(* Mostly affects the initial start, then works without issues *)
+
 LocalKernelObject /: GenericKernel`SubmitTransaction[k_LocalKernelObject, t_] := With[{ev = t["Evaluator"], s = Transaction`Serialize[t]},
     LinkWrite[k["Link"], EnterExpressionPacket[ Internal`Kernel`Apply[ ev, s ] ] // Unevaluated  ]
 ]
@@ -324,6 +330,10 @@ GenericKernel`Stdout[k_LocalKernelObject][any_] := k["LTPSocket"][any]
 
 SetAttributes[GenericKernel`Async, HoldRest]
 
+(* [NOTE] You may easily overload the evaluation que on Windows machines *)
+(* It will stall during LinkWrite *)
+(* Mostly affects the initial start, then works without issues *)
+
 LocalKernelObject /: GenericKernel`Init[k_LocalKernelObject, expr_, OptionsPattern[] ] := With[{once = OptionValue["Once"], tracker = OptionValue["TrackingProgress"]},
     If[!once,
         With[{

Scripts/bundle.wls

@@ -48,7 +48,8 @@ PacletRepositories[{
   Github -> "https://github.com/JerryI/WebSocketHandler" -> "master",
   Github -> "https://github.com/JerryI/CSocketListener" -> "master",
   Github -> "https://github.com/JerryI/wl-wlx" -> "master",
-  Github -> "https://github.com/JerryI/wl-misc" -> "main"
+  Github -> "https://github.com/JerryI/wl-misc" -> "main",
+  Github -> "https://github.com/lshifr/LetWL" -> "master"
 }, "Directory" -> Directory[], "MaxVersionDiff"-> 3 ]
 
 

Scripts/start.wls

@@ -18,7 +18,8 @@ PacletRepositories[{
   Github -> "https://github.com/JerryI/WebSocketHandler" -> "master",
   Github -> "https://github.com/JerryI/CSocketListener" -> "master",
   Github -> "https://github.com/JerryI/wl-wlx" -> "master",
-  Github -> "https://github.com/JerryI/wl-misc" -> "main"
+  Github -> "https://github.com/JerryI/wl-misc" -> "main",
+  Github -> "https://github.com/lshifr/LetWL" -> "master"
 }, "Directory" -> Directory[], "MaxVersionDiff"-> 1, "AutomaticUpdates"-> False ]
 
 (* web-server *)
@@ -32,6 +33,8 @@ Needs["KirillBelov`HTTPHandler`Extensions`"]
 Needs["KirillBelov`WebSocketHandler`"]
 Needs["KirillBelov`LTP`"]
 
+Needs["LetWL`"]
+
 
 Needs["CoffeeLiqueur`Notebook`Utils`"];
 
@@ -129,6 +132,17 @@ With[{appJSON = Import[FileNameJoin[{Directory[], "package.json"}], "RawJSON"]},
 Echo["System`$Env"];
 Echo[ToString[$Env, InputForm] ];
 
+versionToNumber[ver_String] := FromDigits[ToExpression@StringSplit[ver, "."], 1000];
+
+If[versionToNumber[$VersionNumber] > versionToNumber["14.2"],
+  Echo["Warning: your Wolfram Kernel version is higher, that tested with WLJS Notebook. We do not guarantee it will work"];
+];
+
+If[versionToNumber[$VersionNumber] < versionToNumber["13.1"],
+  Echo["Error: your Wolfram Kernel version is lower than 13.1. WLJS App won't work. We are sorry"];
+  Echo["You can always download a freeware Wolfram Engine"];
+  Exit[-1];
+];
 
 MergeDirectories[source_String, target_String] := (
   Echo[StringTemplate["Copy directory `` to ``"][source, target]];

Scripts/update.wls

@@ -20,7 +20,8 @@ PacletRepositories[{
   Github -> "https://github.com/JerryI/WebSocketHandler" -> "master",
   Github -> "https://github.com/JerryI/CSocketListener" -> "master",
   Github -> "https://github.com/JerryI/wl-wlx" -> "master",
-  Github -> "https://github.com/JerryI/wl-misc" -> "main"
+  Github -> "https://github.com/JerryI/wl-misc" -> "main",
+  Github -> "https://github.com/lshifr/LetWL" -> "master"
 }, "Directory" -> Directory[], "MaxVersionDiff"-> 1 ]
 
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "wljs-notebook",
-  "version": "2.7.5",
+  "version": "2.7.6",
   "recommended-client-version": "2.6.3",
   "description": "Dynamic Notebook Environment for Wolfram Language written in Javascript",
   "author": {