Update to WebUI v2.1.0 (#7)

* Update to WebUI v2.0.7

#New Features
* Supporting more web browsers
* Search for web browsers in Windows Reg.
* Using the same show() function for HTML script, files, and refresh content
* Support Chrome on macOS
* The `getInt()` and `returnInt()` are now 64bit integer instead of 32bit

#Breaking code
* Switching from `show(html, browser);` to `show(content);`, and it's used for HTML, files, or reload the window
* Removing `showCopy()`, `refresh()`, `refreshCopy()`

* link additional depenencies

* Add new browsers to `Browser` enum

* add `_webui_show_window`

* Add the rest of the `_webui_browser_start_xxx` functions

* change to clonglong

* int64 -> int/clonglong

* int64 -> int

* int64 -> int

* Add `browserStartXXX` funcs

* Add `showWindow` and `showBrowser`

* update submodule?

---------

Co-authored-by: Grave <[email protected]>

Author: hassandraga

README.md

@@ -91,22 +91,44 @@ be found in WebUI's website [here](https://webui.me/#download).
 In addition, you can also enable WebUI's logging via `-d:webuiLog` but that flag
 only works for static compilation.
 
-## Supported Browsers
-
-| OS      | Browser | Status        |
-| ------  | ------  | ------        |
-| Windows | Firefox | ✔️            |
-| Windows | Chrome  | ✔️            |
-| Windows | Edge    | ✔️            |
-| Linux   | Firefox | ✔️            |
-| Linux   | Chrome  | ✔️            |
-| macOS   | Firefox | *coming soon* |
-| macOS   | Chrome  | *coming soon* |
-| macOS   | Safari  | *coming soon* |
+## Supported Web Browsers
+
+| OS | Browser | Status |
+| ------ | ------ | ------ |
+| Windows | Mozilla Firefox | ✔️ |
+| Windows | Google Chrome | ✔️ |
+| Windows | Microsoft Edge | ✔️ |
+| Windows | Chromium | ✔️ |
+| Windows | Yandex | ✔️ |
+| Windows | Brave | ✔️ |
+| Windows | Vivaldi | ✔️ |
+| Windows | Epic | ✔️ |
+| Windows | Opera | *coming soon* |
+| - | - | - |
+| Linux | Mozilla Firefox | ✔️ |
+| Linux | Google Chrome | ✔️ |
+| Linux | Microsoft Edge | *coming soon* |
+| Linux | Chromium | ✔️ |
+| Linux | Yandex | *coming soon* |
+| Linux | Brave | *coming soon* |
+| Linux | Vivaldi | *coming soon* |
+| Linux | Epic | *coming soon* |
+| Linux | Opera | *coming soon* |
+| - | - | - |
+| macOS | Mozilla Firefox | *coming soon* |
+| macOS | Google Chrome | ✔️ |
+| macOS | Microsoft Edge | *coming soon* |
+| macOS | Chromium | *coming soon* |
+| macOS | Yandex | *coming soon* |
+| macOS | Brave | *coming soon* |
+| macOS | Vivaldi | *coming soon* |
+| macOS | Epic | *coming soon* |
+| macOS | Apple Safari | *coming soon* |
+| macOS | Opera | *coming soon* |
 
 ## License
 
 MIT License. See [LICENSE](LICENSE)
 
-Original WebUI library is licensed under LGPL-2.1. See
+Original WebUI library is licensed under GPLv2.0. See
 [LICENSE](https://github.com/alifcommunity/webui/blob/main/LICENSE).

examples/call_nim_from_js.nim

@@ -79,10 +79,9 @@ proc main =
     # result is sent back to Javascript for you
 
   # Show the window
-  if not window.show(html, BrowserChrome):  # Run the window on Chrome
-    window.show(html, BrowserAny)           # If not, run on any other installed web browser
+  window.show(html)
 
   # Wait until all windows get closed
   wait()
 
-main()
+main()

examples/hello_world.nim

@@ -110,8 +110,7 @@ proc main =
     webui.exit()
 
   # Show the window
-  if not window.show(loginHtml, BrowserChrome):  # Run the window on Chrome
-    window.show(loginHtml, BrowserAny)           # If not, run on any other installed web browser
+  window.show(loginHtml)
 
   # Wait until all windows get closed
   wait()

examples/hello_world_c.nim

@@ -78,8 +78,7 @@ proc main =
     webui.exit()
 
   # Show the window
-  if not window.show(html, BrowserChrome):  # Run the window on Chrome
-    window.show(html, BrowserAny)           # If not, run on any other installed web browser
+  window.show(html)
 
   # Wait until all windows get closed
   wait()

webui.nim

@@ -2,7 +2,7 @@
   Nim wrapper for [WebUI](https://github.com/alifcommunity/webui)
 
   :Author: Jasmine
-  :WebUI Version: 2.0.7
+  :WebUI Version: 2.1.0
 
   # Get Started
 
@@ -400,6 +400,10 @@ type
     BrowserEdge = 3
     BrowserSafari = 4
     BrowserChromium = 5
+    BrowserOpera = 6
+    BrowserBrave = 7
+    BrowserVivaldi = 8
+    BrowserYandex = 9
     BrowserCustom = 99
 
   Runtime* = enum
@@ -616,7 +620,7 @@ proc data*(e: Event): pointer =
 proc response*(e: Event): pointer =
   e.impl.response
 
-proc getInt*(e: Event): int =
+proc getInt*(e: Event): clonglong =
   int bindings.getInt(e.impl)
 
 proc getString*(e: Event): string =
@@ -629,7 +633,7 @@ proc getBool*(e: Event): bool =
   e.getString() == "true"
 
 proc returnInt*(e: Event; n: int) = 
-  bindings.returnInt(e.impl, cint n)
+  bindings.returnInt(e.impl, clonglong n)
 
 proc returnString*(e: Event; s: string) =
   bindings.returnString(e.impl, cstring s)
@@ -719,22 +723,12 @@ proc core*(win: Window): WindowCore =
 
 {.push discardable.}
 
-proc show*(win: Window; html: string; browser: Browser = BrowserAny): bool = 
+proc show*(win: Window; content: string): bool = 
   ## Show Window `win`. If the window is already shown, the UI will get 
   ## refreshed in the same window.
+  ## `content` can be a file name, or a static HTML script
 
-  bindings.show(win.impl, cstring html, cuint ord(browser))
-
-proc showCopy*(win: Window; html: string; browser: Browser = BrowserAny): bool = 
-  bindings.showCpy(win.impl, cstring html, cuint ord(browser))
-
-proc refresh*(win: Window; html: string): bool = 
-  ## Refresh the window UI with any new HTML content.
-
-  bindings.refresh(win.impl, cstring html)
-
-proc refreshCopy*(win: Window; html: string): bool = 
-  bindings.refreshCpy(win.impl, cstring html)
+  bindings.show(win.impl, cstring content)
 
 {.pop.}
 
@@ -924,20 +918,43 @@ proc browserCreateProfileFolder*(win: Window; browser: Browser): bool {.discarda
 
 {.push discardable.}
 
+proc browserStartChrome*(win: Window; address: string | Uri): bool =
+  bindings.browserStartChrome(win.impl, cstring $address)
+
 proc browserStartEdge*(win: Window; address: string | Uri): bool =
   bindings.browserStartEdge(win.impl, cstring $address)
 
+proc browserStartEpic*(win: Window; address: string | Uri): bool =
+  bindings.browserStartEpic(win.impl, cstring $address)
+
+proc browserStartVivaldi*(win: Window; address: string | Uri): bool =
+  bindings.browserStartVivaldi(win.impl, cstring $address)
+
+proc browserStartBrave*(win: Window; address: string | Uri): bool =
+  bindings.browserStartBrave(win.impl, cstring $address)
+
 proc browserStartFirefox*(win: Window; address: string | Uri): bool =
   bindings.browserStartFirefox(win.impl, cstring $address)
 
+proc browserStartYandex*(win: Window; address: string | Uri): bool =
+  bindings.browserStartYandex(win.impl, cstring $address)
+
+proc browserStartChromium*(win: Window; address: string | Uri): bool =
+  bindings.browserStartChromium(win.impl, cstring $address)
+
 proc browserStartCustom*(win: Window; address: string | Uri): bool =
   bindings.browserStartCustom(win.impl, cstring $address)
 
-proc browserStartChrome*(win: Window; address: string | Uri): bool =
-  bindings.browserStartChrome(win.impl, cstring $address)
-
 {.pop.}
 
+proc showWindow*(win: Window, html: string, browser: Browser) = 
+  bindings.showWindow(win.impl, cstring html, cuint ord browser)
+
+proc showBrowser*(win: Window, html: string, browser: Browser) = 
+  ## Alias of `showWindow`
+
+  bindings.showWindow(win.impl, cstring html, cuint ord browser)
+
 proc `rootFolder=`*(win: Window; path: string): bool {.discardable.} =
   bindings.setRootFolder(win.impl, cstring path)
 

webui/bindings.nim

@@ -22,6 +22,7 @@ when useWebuiStaticLib:
   when defined(vcc):
     {.link: "user32.lib".}
     {.link: "ws2_32.lib".}
+    {.link: "Advapi32.lib".}
 
     {.link: webuiStaticLib & ".lib".}
   else:
@@ -33,6 +34,7 @@ when useWebuiStaticLib:
 
     {.passL: "-luser32".} # link dependencies
     {.passL: "-lws2_32".}
+    {.passL: "-lAdvapi32".}
 
   {.pragma: webui, discardable.}
 elif useWebuiDll:
@@ -52,12 +54,14 @@ else:
   when defined(vcc):
     {.link: "user32.lib".}
     {.link: "ws2_32.lib".}
+    {.link: "Advapi32.lib".}
 
     {.passC: "/I " & currentSourceDir / "webui" / "include".}
 
   elif defined(windows):
     {.passL: "-lws2_32".}
     {.passL: "-luser32".}
+    {.passL: "-lAdvapi32".}
 
     {.passC: "-I" & currentSourceDir / "webui" / "include".}
 
@@ -80,7 +84,7 @@ else:
 {.deadCodeElim: on.}
 
 const
-  WEBUI_VERSION*          = "2.0.7"   ## Version
+  WEBUI_VERSION*          = "2.1.0"   ## Version
   WEBUI_HEADER_SIGNATURE* = 0xFF      ## All packets should start with this 8bit
   WEBUI_HEADER_JS*        = 0xFE      ## Javascript result in frontend
   WEBUI_HEADER_CLICK*     = 0xFD      ## Click event
@@ -171,6 +175,12 @@ type
     edge*: cuint      ## 3
     safari*: cuint    ## 4
     chromium*: cuint  ## 5
+    opera*: cuint     ## 6
+    brave*: cuint     ## 7
+    vivaldi*: cuint   ## 8
+    epic*: cuint      ## 9
+    yandex*: cuint    ## 10
+    current*: cuint   ## x
     custom*: cuint    ## 99
 
   Runtime* {.bycopy.} = object
@@ -223,14 +233,8 @@ proc isAnyWindowRunning*(): bool {.cdecl,
 proc isAppRunning*(): bool {.cdecl, importc: "webui_is_app_running", webui.}
 proc setTimeout*(second: cuint) {.cdecl, importc: "webui_set_timeout", webui.}
 proc newWindow*(): ptr Window {.cdecl, importc: "webui_new_window", webui.}
-proc show*(win: ptr Window; html: cstring; browser: cuint): bool {.cdecl,
+proc show*(win: ptr Window; content: cstring): bool {.cdecl,
     importc: "webui_show", webui.}
-proc showCpy*(win: ptr Window; html: cstring; browser: cuint): bool {.cdecl,
-    importc: "webui_show_cpy", webui.}
-proc refresh*(win: ptr Window; html: cstring): bool {.cdecl,
-    importc: "webui_refresh", webui.}
-proc refreshCpy*(win: ptr Window; html: cstring): bool {.cdecl,
-    importc: "webui_refresh_cpy", webui.}
 proc setIcon*(win: ptr Window; iconS: cstring; typeS: cstring) {.cdecl,
     importc: "webui_set_icon", webui.}
 proc multiAccess*(win: ptr Window; status: bool) {.cdecl,
@@ -252,10 +256,10 @@ proc scriptCleanup*(script: ptr Script) {.cdecl,
     importc: "webui_script_cleanup", webui.}
 proc scriptRuntime*(win: ptr Window; runtime: cuint) {.cdecl,
     importc: "webui_script_runtime", webui.}
-proc getInt*(e: ptr Event): cint {.cdecl, importc: "webui_get_int", webui.}
+proc getInt*(e: ptr Event): clonglong {.cdecl, importc: "webui_get_int", webui.}
 proc getString*(e: ptr Event): cstring {.cdecl, importc: "webui_get_string", webui.}
 proc getBool*(e: ptr Event): bool {.cdecl, importc: "webui_get_bool", webui.}
-proc returnInt*(e: ptr Event; n: cint) {.cdecl, importc: "webui_return_int", webui.}
+proc returnInt*(e: ptr Event; n: clonglong) {.cdecl, importc: "webui_return_int", webui.}
 proc returnString*(e: ptr Event; s: cstring) {.cdecl,
     importc: "webui_return_string", webui.}
 proc returnBool*(e: ptr Event; b: bool) {.cdecl, importc: "webui_return_bool", webui.}
@@ -329,14 +333,24 @@ proc folderExist*(folder: cstring): bool {.cdecl,
 
 proc browserCreateProfileFolder*(win: ptr Window; browser: cuint): bool {.cdecl,
     importc: "_webui_browser_create_profile_folder", webui.}
+proc browserStartChrome*(win: ptr Window; address: cstring): bool {.cdecl,
+    importc: "_webui_browser_start_chrome", webui.}
 proc browserStartEdge*(win: ptr Window; address: cstring): bool {.cdecl,
     importc: "_webui_browser_start_edge", webui.}
+proc browserStartEpic*(win: ptr Window; address: cstring): bool {.cdecl,
+    importc: "_webui_browser_start_epic", webui.}
+proc browserStartVivaldi*(win: ptr Window; address: cstring): bool {.cdecl,
+    importc: "_webui_browser_start_vivaldi", webui.}
+proc browserStartBrave*(win: ptr Window; address: cstring): bool {.cdecl,
+    importc: "_webui_browser_start_brave", webui.}
 proc browserStartFirefox*(win: ptr Window; address: cstring): bool {.cdecl,
     importc: "_webui_browser_start_firefox", webui.}
+proc browserStartYandex*(win: ptr Window; address: cstring): bool {.cdecl,
+    importc: "_webui_browser_start_yandex", webui.}
+proc browserStartChromium*(win: ptr Window; address: cstring): bool {.cdecl,
+    importc: "_webui_browser_start_chromium", webui.}
 proc browserStartCustom*(win: ptr Window; address: cstring): bool {.cdecl,
     importc: "_webui_browser_start_custom", webui.}
-proc browserStartChrome*(win: ptr Window; address: cstring): bool {.cdecl,
-    importc: "_webui_browser_start_chrome", webui.}
 proc browserStart*(win: ptr Window; address: cstring; browser: cuint): bool {.
     cdecl, importc: "_webui_browser_start", webui.}
 
@@ -371,3 +385,6 @@ proc fileExistMg*(evData: pointer): bool {.cdecl,
 # use std/os?
 proc fileExist*(file: cstring): bool {.cdecl, importc: "_webui_file_exist", webui.}
 proc freeAllMem*() {.cdecl, importc: "_webui_free_all_mem", webui.}
+
+proc showWindow*(win: ptr Window; html: cstring; browser: cuint): bool {.cdecl, 
+    importc: "_webui_show_window", webui.}