@yufengtadian/freedom-cli 1.12.1 → 1.12.13

package/templates/go/webview_go/libs/webview/vendor.go

@@ -0,0 +1,2 @@
+// Dummy file to allow vendoring.
+package vendor

package/templates/go/webview_go/libs/webview/version.txt

@@ -0,0 +1 @@
+fb6b17d826041411e6346cd9a785a5ceba7987c4

package/templates/go/webview_go/webview.cc

@@ -0,0 +1 @@
+#include "webview.h"

package/templates/go/webview_go/webview.go

@@ -0,0 +1,379 @@
+package webview
+
+/*
+#cgo CFLAGS: -I${SRCDIR}/libs/webview/include
+#cgo CXXFLAGS: -I${SRCDIR}/libs/webview/include -DWEBVIEW_STATIC
+
+#cgo linux openbsd freebsd netbsd CXXFLAGS: -DWEBVIEW_GTK -std=c++11
+#cgo linux openbsd freebsd netbsd LDFLAGS: -ldl
+#cgo linux openbsd freebsd netbsd pkg-config: gtk+-3.0 webkit2gtk-4.0
+
+#cgo darwin CXXFLAGS: -DWEBVIEW_COCOA -std=c++11
+#cgo darwin LDFLAGS: -framework WebKit -ldl
+
+#cgo windows CXXFLAGS: -DWEBVIEW_EDGE -std=c++14 -I${SRCDIR}/libs/mswebview2/include
+#cgo windows LDFLAGS: -static -ladvapi32 -lole32 -lshell32 -lshlwapi -luser32 -lversion
+
+#include "webview.h"
+
+#include <stdlib.h>
+#include <stdint.h>
+
+void CgoWebViewDispatch(webview_t w, uintptr_t arg);
+void CgoWebViewBind(webview_t w, const char *name, uintptr_t index);
+void CgoWebViewUnbind(webview_t w, const char *name);
+*/
+import "C"
+import (
+	_ "github.com/webview/webview_go/libs/mswebview2"
+	_ "github.com/webview/webview_go/libs/mswebview2/include"
+	_ "github.com/webview/webview_go/libs/webview"
+	_ "github.com/webview/webview_go/libs/webview/include"
+	"encoding/json"
+	"errors"
+	"reflect"
+	"runtime"
+	"sync"
+	"unsafe"
+)
+
+func init() {
+	// Ensure that main.main is called from the main thread
+	runtime.LockOSThread()
+}
+
+// Hints are used to configure window sizing and resizing
+type Hint int
+
+// WindowAction 是原生窗口控制动作（前端自绘标题栏三按钮使用）。
+type WindowAction int
+
+const (
+	// WindowMinimize 最小化窗口
+	WindowMinimize WindowAction = iota
+	// WindowMaximize 最大化窗口
+	WindowMaximize
+	// WindowUnmaximize 取消最大化
+	WindowUnmaximize
+	// WindowRestore 还原窗口（取消最大化并恢复到前台）
+	WindowRestore
+	// WindowClose 关闭窗口
+	WindowClose
+	// WindowToggleMaximize 在最大化/还原间切换
+	WindowToggleMaximize
+	// WindowIsMaximized 查询窗口是否最大化
+	WindowIsMaximized
+)
+
+const (
+	// Width and height are default size
+	HintNone = C.WEBVIEW_HINT_NONE
+
+	// Window size can not be changed by a user
+	HintFixed = C.WEBVIEW_HINT_FIXED
+
+	// Width and height are minimum bounds
+	HintMin = C.WEBVIEW_HINT_MIN
+
+	// Width and height are maximum bounds
+	HintMax = C.WEBVIEW_HINT_MAX
+)
+
+type WebView interface {
+
+	// Run runs the main loop until it's terminated. After this function exits -
+	// you must destroy the webview.
+	Run()
+
+	// Terminate stops the main loop. It is safe to call this function from
+	// a background thread.
+	Terminate()
+
+	// Dispatch posts a function to be executed on the main thread. You normally
+	// do not need to call this function, unless you want to tweak the native
+	// window.
+	Dispatch(f func())
+
+	// Destroy destroys a webview and closes the native window.
+	Destroy()
+
+	// Window returns a native window handle pointer. When using GTK backend the
+	// pointer is GtkWindow pointer, when using Cocoa backend the pointer is
+	// NSWindow pointer, when using Win32 backend the pointer is HWND pointer.
+	Window() unsafe.Pointer
+
+	// SetTitle updates the title of the native window. Must be called from the UI
+	// thread.
+	SetTitle(title string)
+
+	// SetDecorated controls whether the native window shows its system title
+	// bar decoration. frameless mode should call SetDecorated(false) so the
+	// front-end can draw its own min/max/close buttons. Must be called from
+	// the UI thread. On Windows this is a no-op (handled by the freedom shell
+	// layer via WS_CAPTION / WM_NCHITTEST).
+	SetDecorated(decorated bool)
+
+	// WindowControl 执行原生窗口控制动作（最小化/最大化/还原/关闭/查询）。
+	// 返回 0 表示成功，-1 表示平台不支持；WindowIsMaximized 返回 1/0。
+	// 供前端自绘标题栏三按钮调用。Windows 上由 freedom 壳层处理，此处返回 -1。
+	WindowControl(action WindowAction) int
+
+	// BeginMoveDrag 发起无边框窗口的原生拖动（macOS/Linux）。
+	// Windows 由 freedom 壳层用 WM_NCLBUTTONDOWN 处理，此处返回 -1。
+	BeginMoveDrag() int
+
+	// SetSize updates native window size. See Hint constants.
+	SetSize(w int, h int, hint Hint)
+
+	// Navigate navigates webview to the given URL. URL may be a properly encoded data.
+	// URI. Examples:
+	// w.Navigate("https://github.com/webview/webview")
+	// w.Navigate("data:text/html,%3Ch1%3EHello%3C%2Fh1%3E")
+	// w.Navigate("data:text/html;base64,PGgxPkhlbGxvPC9oMT4=")
+	Navigate(url string)
+
+	// SetHtml sets the webview HTML directly.
+	// Example: w.SetHtml(w, "<h1>Hello</h1>");
+	SetHtml(html string)
+
+	// Init injects JavaScript code at the initialization of the new page. Every
+	// time the webview will open a the new page - this initialization code will
+	// be executed. It is guaranteed that code is executed before window.onload.
+	Init(js string)
+
+	// Eval evaluates arbitrary JavaScript code. Evaluation happens asynchronously,
+	// also the result of the expression is ignored. Use RPC bindings if you want
+	// to receive notifications about the results of the evaluation.
+	Eval(js string)
+
+	// Bind binds a callback function so that it will appear under the given name
+	// as a global JavaScript function. Internally it uses webview_init().
+	// Callback receives a request string and a user-provided argument pointer.
+	// Request string is a JSON array of all the arguments passed to the
+	// JavaScript function.
+	//
+	// f must be a function
+	// f must return either value and error or just error
+	Bind(name string, f interface{}) error
+
+	// Removes a callback that was previously set by Bind.
+	Unbind(name string) error
+}
+
+type webview struct {
+	w C.webview_t
+}
+
+var (
+	m        sync.Mutex
+	index    uintptr
+	dispatch = map[uintptr]func(){}
+	bindings = map[uintptr]func(id, req string) (interface{}, error){}
+)
+
+func boolToInt(b bool) C.int {
+	if b {
+		return 1
+	}
+	return 0
+}
+
+// New calls NewWindow to create a new window and a new webview instance. If debug
+// is non-zero - developer tools will be enabled (if the platform supports them).
+func New(debug bool) WebView { return NewWindow(debug, nil) }
+
+// NewWindow creates a new webview instance. If debug is non-zero - developer
+// tools will be enabled (if the platform supports them). Window parameter can be
+// a pointer to the native window handle. If it's non-null - then child WebView is
+// embedded into the given parent window. Otherwise a new window is created.
+// Depending on the platform, a GtkWindow, NSWindow or HWND pointer can be passed
+// here.
+func NewWindow(debug bool, window unsafe.Pointer) WebView {
+	w := &webview{}
+	w.w = C.webview_create(boolToInt(debug), window)
+	return w
+}
+
+func (w *webview) Destroy() {
+	C.webview_destroy(w.w)
+}
+
+func (w *webview) Run() {
+	C.webview_run(w.w)
+}
+
+func (w *webview) Terminate() {
+	C.webview_terminate(w.w)
+}
+
+func (w *webview) Window() unsafe.Pointer {
+	return C.webview_get_window(w.w)
+}
+
+func (w *webview) Navigate(url string) {
+	s := C.CString(url)
+	defer C.free(unsafe.Pointer(s))
+	C.webview_navigate(w.w, s)
+}
+
+func (w *webview) SetHtml(html string) {
+	s := C.CString(html)
+	defer C.free(unsafe.Pointer(s))
+	C.webview_set_html(w.w, s)
+}
+
+func (w *webview) SetTitle(title string) {
+	s := C.CString(title)
+	defer C.free(unsafe.Pointer(s))
+	C.webview_set_title(w.w, s)
+}
+
+func (w *webview) SetDecorated(decorated bool) {
+	C.webview_set_decorated(w.w, boolToInt(decorated))
+}
+
+func (w *webview) WindowControl(action WindowAction) int {
+	return int(C.webview_window_control(w.w, C.webview_window_action_t(action)))
+}
+
+func (w *webview) BeginMoveDrag() int {
+	return int(C.webview_window_begin_move_drag(w.w))
+}
+
+func (w *webview) SetSize(width int, height int, hint Hint) {
+	C.webview_set_size(w.w, C.int(width), C.int(height), C.webview_hint_t(hint))
+}
+
+func (w *webview) Init(js string) {
+	s := C.CString(js)
+	defer C.free(unsafe.Pointer(s))
+	C.webview_init(w.w, s)
+}
+
+func (w *webview) Eval(js string) {
+	s := C.CString(js)
+	defer C.free(unsafe.Pointer(s))
+	C.webview_eval(w.w, s)
+}
+
+func (w *webview) Dispatch(f func()) {
+	m.Lock()
+	for ; dispatch[index] != nil; index++ {
+	}
+	dispatch[index] = f
+	m.Unlock()
+	C.CgoWebViewDispatch(w.w, C.uintptr_t(index))
+}
+
+//export _webviewDispatchGoCallback
+func _webviewDispatchGoCallback(index unsafe.Pointer) {
+	m.Lock()
+	f := dispatch[uintptr(index)]
+	delete(dispatch, uintptr(index))
+	m.Unlock()
+	f()
+}
+
+//export _webviewBindingGoCallback
+func _webviewBindingGoCallback(w C.webview_t, id *C.char, req *C.char, index uintptr) {
+	m.Lock()
+	f := bindings[uintptr(index)]
+	m.Unlock()
+	jsString := func(v interface{}) string { b, _ := json.Marshal(v); return string(b) }
+	status, result := 0, ""
+	if res, err := f(C.GoString(id), C.GoString(req)); err != nil {
+		status = -1
+		result = jsString(err.Error())
+	} else if b, err := json.Marshal(res); err != nil {
+		status = -1
+		result = jsString(err.Error())
+	} else {
+		status = 0
+		result = string(b)
+	}
+	s := C.CString(result)
+	defer C.free(unsafe.Pointer(s))
+	C.webview_return(w, id, C.int(status), s)
+}
+
+func (w *webview) Bind(name string, f interface{}) error {
+	v := reflect.ValueOf(f)
+	// f must be a function
+	if v.Kind() != reflect.Func {
+		return errors.New("only functions can be bound")
+	}
+	// f must return either value and error or just error
+	if n := v.Type().NumOut(); n > 2 {
+		return errors.New("function may only return a value or a value+error")
+	}
+
+	binding := func(id, req string) (interface{}, error) {
+		raw := []json.RawMessage{}
+		if err := json.Unmarshal([]byte(req), &raw); err != nil {
+			return nil, err
+		}
+
+		isVariadic := v.Type().IsVariadic()
+		numIn := v.Type().NumIn()
+		if (isVariadic && len(raw) < numIn-1) || (!isVariadic && len(raw) != numIn) {
+			return nil, errors.New("function arguments mismatch")
+		}
+		args := []reflect.Value{}
+		for i := range raw {
+			var arg reflect.Value
+			if isVariadic && i >= numIn-1 {
+				arg = reflect.New(v.Type().In(numIn - 1).Elem())
+			} else {
+				arg = reflect.New(v.Type().In(i))
+			}
+			if err := json.Unmarshal(raw[i], arg.Interface()); err != nil {
+				return nil, err
+			}
+			args = append(args, arg.Elem())
+		}
+		errorType := reflect.TypeOf((*error)(nil)).Elem()
+		res := v.Call(args)
+		switch len(res) {
+		case 0:
+			// No results from the function, just return nil
+			return nil, nil
+		case 1:
+			// One result may be a value, or an error
+			if res[0].Type().Implements(errorType) {
+				if res[0].Interface() != nil {
+					return nil, res[0].Interface().(error)
+				}
+				return nil, nil
+			}
+			return res[0].Interface(), nil
+		case 2:
+			// Two results: first one is value, second is error
+			if !res[1].Type().Implements(errorType) {
+				return nil, errors.New("second return value must be an error")
+			}
+			if res[1].Interface() == nil {
+				return res[0].Interface(), nil
+			}
+			return res[0].Interface(), res[1].Interface().(error)
+		default:
+			return nil, errors.New("unexpected number of return values")
+		}
+	}
+
+	m.Lock()
+	for ; bindings[index] != nil; index++ {
+	}
+	bindings[index] = binding
+	m.Unlock()
+	cname := C.CString(name)
+	defer C.free(unsafe.Pointer(cname))
+	C.CgoWebViewBind(w.w, cname, C.uintptr_t(index))
+	return nil
+}
+
+func (w *webview) Unbind(name string) error {
+	cname := C.CString(name)
+	defer C.free(unsafe.Pointer(cname))
+	C.CgoWebViewUnbind(w.w, cname)
+	return nil
+}

package/templates/go/webview_go/webview_test.go

@@ -0,0 +1,50 @@
+package webview
+
+import (
+	"flag"
+	"log"
+	"os"
+	"testing"
+)
+
+func Example() {
+	w := New(true)
+	defer w.Destroy()
+	w.SetTitle("Hello")
+	w.Bind("noop", func() string {
+		log.Println("hello")
+		return "hello"
+	})
+	w.Bind("add", func(a, b int) int {
+		return a + b
+	})
+	w.Bind("quit", func() {
+		w.Terminate()
+	})
+	w.SetHtml(`<!doctype html>
+		<html>
+			<body>hello</body>
+			<script>
+				window.onload = function() {
+					document.body.innerText = ` + "`hello, ${navigator.userAgent}`" + `;
+					noop().then(function(res) {
+						console.log('noop res', res);
+						add(1, 2).then(function(res) {
+							console.log('add res', res);
+							quit();
+						});
+					});
+				};
+			</script>
+		</html>
+	)`)
+	w.Run()
+}
+
+func TestMain(m *testing.M) {
+	flag.Parse()
+	if testing.Verbose() {
+		Example()
+	}
+	os.Exit(m.Run())
+}

package/templates/project/freedom.config.js

@@ -18,11 +18,11 @@ export default {
   // 是否开启 WebView 开发者工具。
   debug: false,
 
-  // 标题栏策略，在终端随时可改，三选一：
-  //   'native'    - 保留系统原生标题栏
-  //   'hidden'    - 隐藏标题栏视觉，仅保留 Windows 原生最小化 / 最大化 / 关闭按钮
-  //   'frameless' - 完全无边框，标题栏不存在，关闭 / 最大化 / 最小化按钮由前端自绘（模板已内置示例，默认）
-  // 终端命令：freedom titlebar <native|hidden|frameless>
+  // 标题栏策略，在终端随时可改，二选一：
+  //   'native'    - 保留系统原生标题栏，标题栏图标与 exe 图标一致
+  //   'frameless' - 完全无边框，标题栏与 Windows 原生最小化 / 最大化 / 关闭按钮均不存在，
+  //                 关闭 / 最大化 / 最小化按钮由前端自绘（模板已内置示例，默认）
+  // 终端命令：freedom titlebar <native|frameless>
   titlebar: 'frameless',
 
   // 应用图标（可执行文件 / .app 的图标）：

package/templates/project/index.html

@@ -24,12 +24,21 @@
       flex: 0 0 38px;
       align-items: center;
       justify-content: space-between;
-      padding-left: 14px;
+      padding-left: 12px;
       background: rgba(17, 24, 39, .92);
       border-bottom: 1px solid rgba(156, 163, 175, .15);
-      -webkit-app-region: drag;
+      /* 拖动改为 JS 实现（startDrag），以便保留双击最大化 / 右键菜单事件 */
+      -webkit-user-select: none;
+    }
+    .titlebar-left { display: flex; align-items: center; gap: 8px; min-width: 0; }
+    .tb-icon {
+      width: 16px; height: 16px; flex: 0 0 16px;
+      object-fit: contain; display: none;
+    }
+    .titlebar .tb-title {
+      font-size: 13px; color: #9ca3af;
+      white-space: nowrap; overflow: hidden; text-overflow: ellipsis;
     }
-    .titlebar .tb-title { font-size: 13px; color: #9ca3af; }
     .tb-btns { display: flex; height: 100%; -webkit-app-region: no-drag; }
     .tb-btn {
       width: 46px; height: 100%;
@@ -42,6 +51,25 @@
     .tb-btn.close:hover { background: #e81123; color: #fff; }
     body.freedom-frameless .titlebar { display: flex; }
 
+    /* 标题栏右键菜单 */
+    .tb-menu {
+      position: fixed; z-index: 9999;
+      min-width: 160px; padding: 4px;
+      background: rgba(30, 41, 59, .98);
+      border: 1px solid rgba(156, 163, 175, .25);
+      border-radius: 8px;
+      box-shadow: 0 8px 24px rgba(0, 0, 0, .4);
+      display: none;
+    }
+    .tb-menu-item {
+      display: flex; align-items: center;
+      padding: 6px 12px; font-size: 13px; color: #e5e7eb;
+      border-radius: 5px; cursor: default;
+    }
+    .tb-menu-item:hover { background: rgba(99, 102, 241, .35); }
+    .tb-menu-item.danger:hover { background: #e81123; }
+    .tb-menu-divider { height: 1px; margin: 4px 6px; background: rgba(156, 163, 175, .2); }
+
     main {
       flex: 1;
       display: flex; flex-direction: column;
@@ -61,8 +89,11 @@
   </style>
 </head>
 <body>
-  <div class="titlebar">
-    <div class="tb-title">Freedom App</div>
+  <div class="titlebar" id="titlebar">
+    <div class="titlebar-left">
+      <img class="tb-icon" id="tbIcon" alt="" draggable="false">
+      <div class="tb-title" id="tbTitle">Freedom App</div>
+    </div>
     <div class="tb-btns">
       <button class="tb-btn" id="tbMin">&#xE921;</button>
       <button class="tb-btn" id="tbMax">&#xE922;</button>
@@ -70,6 +101,15 @@
     </div>
   </div>
 
+  <!-- 标题栏右键菜单 -->
+  <div class="tb-menu" id="tbMenu">
+    <div class="tb-menu-item" data-action="restore">还原</div>
+    <div class="tb-menu-item" data-action="minimize">最小化</div>
+    <div class="tb-menu-item" data-action="maximize">最大化</div>
+    <div class="tb-menu-divider"></div>
+    <div class="tb-menu-item danger" data-action="close">关闭</div>
+  </div>
+
   <main>
     <h1>Freedom App</h1>
     <div class="desc">你的桌面应用已就绪。</div>