mirror of
https://github.com/taigrr/wails.git
synced 2026-04-17 12:15:02 -07:00
Feature/v2 mac (#555)
* Get it compiling
* Stubs in place to compile
* Semi runs
* add darwin platform for server
* Evaluation working correctly. Still WIP
* Ignore favicon for desktop
* lint
* Remove feature flag code
* More feature flag removal
* Support sending messages to the backend
* Callbacks working
* Add Center + refactor prefs
* Fix logger
* Callback hooks for MOAE
* Update packages
* ignore test builds
* Support Un/Fullscreen
* vscode stuff
* Only show window when rendered
* Get it compiling again!
* Support tons of stuff!
* Tidy up
* More refactoring
* WIP [bugged]
* Got get frame working
* fix setsize and setposition
* Add Mac Application Options
* Add HideTitleBar
* Support more mac window options
* Add Toolbar support for Mac
* Support colour
* Support runtime colour change
* Moved options to own package
* Refactored mac titlebar options
* Support hidden titlebar
* Support HiddenInset Titlebar
* Support TitleBar Default
Fixed merging defaults
* Sample titlebars
* Fix minmax app
* Min/Max size supported
* WIP: Support multiple value return
* Support OpenDialog
* Remove old dialog code
* change service bus topics for dialogs
* Revert changes to v1
* Use options struct for dialogs
* Initial support for OpenDialog
* Support selecting files+dirs
* Support multiple files in dialog
* Support all dialog properties
* Add comments
* Filter support
* Support default directory
* Support SaveDialog
* Tidy Up
* WIP: Basics of window drag
* Support window dragging
* Update tests
* Frameless is calculated for Mac
* Tidy up
* Support vibrancy and transparency for webview
Options Colour -> RGBA
* Rename vibrancy to appearance
* Add default appearance
* Refactor part 1
* Refactor Part 2
* Support Translucent Window Background
* Update runtime test
* Add IsDarkMode
Updated runtime test
* Support theme mode change event
* Misc fixes for events
* Support OnMultiple
* Small fixes to frontend events
* Add System calls to runtime
* Add system calls to js runtime
* Support System calls in Go Runtime
* Port Sync Store
* Refactor store. Add get().
* Refactor system. Add IsDarkMode state store
* Use IsDarkMode state store
* Remove generated files
* Support setting app state at startup
* Add Store to go runtime
* Update runtime to v1.0.3
* Remove unused event messages
* Debugging
* initial kitchen sink
* Fix right click crash
* Better drag support
* WIP
* Remove log package
* Add Log to Go runtime
* Add logging to kitchen sink
* Improved CodeBlock. Dark mode to store.
* Start Events. List styling moved to global scope.
* Make logger a public package
* Revert logger package
* Major logging refactor
* Make Ffenestri use logging subsystem.
* Debug refactor
* Add trace to JS runtime
* Migrate runtime to @wails
* Support Trace in kitchensink
* Support trace in go runtime
* Support log level
* Support Print in JS runtime
* Runtime v1.0.1
* Move Info message to Trace
* Support Print logging
* Updated Logger interface
* Fix number of methods in Log
* Support SetLogLevel() at runtime
Refactor of loglevel
* Made go runtime package public.
Using loglevel store to keep loglevel in sync
* Support dynamic loglevel
* Runtime refactor
* Fully refactored logging
* Better looking scrollbar
* Terminal output component
* Link component
* SetLogLevel fully supported
* Runtime defs update.
Slight System refactor
* More Logging updates
* Move preview for SetLogLevel
* Fix log level reactivity.
Misc fixes and tweaks
* logging: slight refactor
* Update logger constants to fix default values
* @wails/runtime v1.0.4
* Fix change in logging levels
* hook in windowWillClose
* refactor clilogger
* WIP Events.On
* Add Events.On
* Improved error handling?
* Disable annoying smart quotes
* update runtime definitions
* Support Emit & Once. Improved On.
* Remove old event methods
* Remove old Event methods
* Update runtime in kitchensink
* Revert Fatal on JS Error
* Tidy up events runtime
* Finish events page
* Update Browser runtime API
* Unify Browser runtime
* JS Runtime v1.0.8
* Fix browser runtime export
* Remove debug line
* Add Browser examples
* Update title
* Improved runtime.System
* Update runtime.System to make all methods
* Expose System methods in Go runtime
* Add System to kitchensink
* Huge improvement to calls: Now handles objects
* Add JS runtime Dialog
* Dialog WIP
* Js package generation (#554)
* WIP
* Generation of index.js
* Add RelativeToCwd
* Add JSDoc comments
* Convert to ES6 syntax
* Fix typo
* Initial generation of typescript declarations
* Typescript improvements
* Improved @returns jsdoc
* Improved declaration files
* Simplified output
* Rename file
* Tidy up
* Revert "Simplified output"
This reverts commit 15cdf7382b.
* Now parsing actual code
* Support Array types
* Reimagined parser
* Wrap parsing in Parser
* Rewritten module generator (TS Only)
* Final touches
* Slight refactor to improve output
* Struct comments. External struct literal binding
* Reworked project parser *working*
* remove debug info
* Refactor of parser
* remove the spew
* Better Ts support
* Better project generation logic
* Support local functions in bind()
* JS Object generation. Linting.
* Support json tags in module generation
* Updated mod files
* Support vscode file generation
* Better global.d.ts
* add ts-check to templates
* Support TS declaration files
* improved 'generate' command for module
Co-authored-by: Travis McLane <tmclane@gmail.com>
This commit is contained in:
@@ -3,7 +3,7 @@ package subsystem
|
||||
import (
|
||||
"github.com/wailsapp/wails/v2/internal/binding"
|
||||
"github.com/wailsapp/wails/v2/internal/logger"
|
||||
"github.com/wailsapp/wails/v2/internal/runtime/goruntime"
|
||||
"github.com/wailsapp/wails/v2/internal/runtime"
|
||||
"github.com/wailsapp/wails/v2/internal/servicebus"
|
||||
)
|
||||
|
||||
@@ -21,11 +21,11 @@ type Binding struct {
|
||||
logger logger.CustomLogger
|
||||
|
||||
// runtime
|
||||
runtime *goruntime.Runtime
|
||||
runtime *runtime.Runtime
|
||||
}
|
||||
|
||||
// NewBinding creates a new binding subsystem. Uses the given bindings db for reference.
|
||||
func NewBinding(bus *servicebus.ServiceBus, logger *logger.Logger, bindings *binding.Bindings, runtime *goruntime.Runtime) (*Binding, error) {
|
||||
func NewBinding(bus *servicebus.ServiceBus, logger *logger.Logger, bindings *binding.Bindings, runtime *runtime.Runtime) (*Binding, error) {
|
||||
|
||||
// Register quit channel
|
||||
quitChannel, err := bus.Subscribe("quit")
|
||||
|
||||
@@ -3,10 +3,12 @@ package subsystem
|
||||
import (
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"strings"
|
||||
|
||||
"github.com/wailsapp/wails/v2/internal/binding"
|
||||
"github.com/wailsapp/wails/v2/internal/logger"
|
||||
"github.com/wailsapp/wails/v2/internal/messagedispatcher/message"
|
||||
"github.com/wailsapp/wails/v2/internal/runtime"
|
||||
"github.com/wailsapp/wails/v2/internal/servicebus"
|
||||
)
|
||||
|
||||
@@ -25,10 +27,13 @@ type Call struct {
|
||||
|
||||
// logger
|
||||
logger logger.CustomLogger
|
||||
|
||||
// runtime
|
||||
runtime *runtime.Runtime
|
||||
}
|
||||
|
||||
// NewCall creates a new log subsystem
|
||||
func NewCall(bus *servicebus.ServiceBus, logger *logger.Logger, DB *binding.DB) (*Call, error) {
|
||||
// NewCall creates a new call subsystem
|
||||
func NewCall(bus *servicebus.ServiceBus, logger *logger.Logger, DB *binding.DB, runtime *runtime.Runtime) (*Call, error) {
|
||||
|
||||
// Register quit channel
|
||||
quitChannel, err := bus.Subscribe("quit")
|
||||
@@ -48,6 +53,7 @@ func NewCall(bus *servicebus.ServiceBus, logger *logger.Logger, DB *binding.DB)
|
||||
logger: logger.CustomLogger("Call Subsystem"),
|
||||
DB: DB,
|
||||
bus: bus,
|
||||
runtime: runtime,
|
||||
}
|
||||
|
||||
return result, nil
|
||||
@@ -65,7 +71,7 @@ func (c *Call) Start() error {
|
||||
case <-c.quitChannel:
|
||||
c.running = false
|
||||
case callMessage := <-c.callChannel:
|
||||
|
||||
// TODO: Check if this works ok in a goroutine
|
||||
c.processCall(callMessage)
|
||||
}
|
||||
}
|
||||
@@ -87,6 +93,12 @@ func (c *Call) processCall(callMessage *servicebus.Message) {
|
||||
// Lookup method
|
||||
registeredMethod := c.DB.GetMethod(payload.Name)
|
||||
|
||||
// Check if it's a system call
|
||||
if strings.HasPrefix(payload.Name, ".wails.") {
|
||||
c.processSystemCall(payload, callMessage.Target())
|
||||
return
|
||||
}
|
||||
|
||||
// Check we have it
|
||||
if registeredMethod == nil {
|
||||
c.sendError(fmt.Errorf("Method not registered"), payload, callMessage.Target())
|
||||
@@ -94,7 +106,12 @@ func (c *Call) processCall(callMessage *servicebus.Message) {
|
||||
}
|
||||
c.logger.Trace("Got registered method: %+v", registeredMethod)
|
||||
|
||||
result, err := registeredMethod.Call(payload.Args)
|
||||
args, err := registeredMethod.ParseArgs(payload.Args)
|
||||
if err != nil {
|
||||
c.sendError(fmt.Errorf("Error parsing arguments: %s", err.Error()), payload, callMessage.Target())
|
||||
}
|
||||
|
||||
result, err := registeredMethod.Call(args)
|
||||
if err != nil {
|
||||
c.sendError(err, payload, callMessage.Target())
|
||||
return
|
||||
@@ -105,6 +122,16 @@ func (c *Call) processCall(callMessage *servicebus.Message) {
|
||||
|
||||
}
|
||||
|
||||
func (c *Call) processSystemCall(payload *message.CallMessage, clientID string) {
|
||||
c.logger.Trace("Got internal System call: %+v", payload)
|
||||
callName := strings.TrimPrefix(payload.Name, ".wails.")
|
||||
switch callName {
|
||||
case "IsDarkMode":
|
||||
darkModeEnabled := c.runtime.System.IsDarkMode()
|
||||
c.sendResult(darkModeEnabled, payload, clientID)
|
||||
}
|
||||
}
|
||||
|
||||
func (c *Call) sendResult(result interface{}, payload *message.CallMessage, clientID string) {
|
||||
c.logger.Trace("Sending success result with CallbackID '%s' : %+v\n", payload.CallbackID, result)
|
||||
message := &CallbackMessage{
|
||||
|
||||
@@ -15,7 +15,7 @@ import (
|
||||
// means it does not expire (default).
|
||||
type eventListener struct {
|
||||
callback func(...interface{}) // Function to call with emitted event data
|
||||
counter int64 // The number of times this callback may be called. -1 = infinite
|
||||
counter int // The number of times this callback may be called. -1 = infinite
|
||||
delete bool // Flag to indicate that this listener should be deleted
|
||||
}
|
||||
|
||||
@@ -60,12 +60,12 @@ func NewEvent(bus *servicebus.ServiceBus, logger *logger.Logger) (*Event, error)
|
||||
}
|
||||
|
||||
// RegisterListener provides a means of subscribing to events of type "eventName"
|
||||
func (e *Event) RegisterListener(eventName string, callback func(...interface{})) {
|
||||
func (e *Event) RegisterListener(eventName string, callback func(...interface{}), counter int) {
|
||||
|
||||
// Create new eventListener
|
||||
thisListener := &eventListener{
|
||||
callback: callback,
|
||||
counter: 0,
|
||||
counter: counter,
|
||||
delete: false,
|
||||
}
|
||||
|
||||
@@ -120,7 +120,7 @@ func (e *Event) Start() error {
|
||||
var message *message.OnEventMessage = eventMessage.Data().(*message.OnEventMessage)
|
||||
eventName := message.Name
|
||||
callback := message.Callback
|
||||
e.RegisterListener(eventName, callback)
|
||||
e.RegisterListener(eventName, callback, message.Counter)
|
||||
e.logger.Trace("Registered listener for event '%s' with callback %p", eventName, callback)
|
||||
default:
|
||||
e.logger.Error("unknown event message: %+v", eventMessage)
|
||||
@@ -141,7 +141,7 @@ func (e *Event) notifyListeners(eventName string, message *message.EventMessage)
|
||||
// Get list of event listeners
|
||||
listeners := e.listeners[eventName]
|
||||
if listeners == nil {
|
||||
println("no listeners for", eventName)
|
||||
e.logger.Trace("No listeners for %s", eventName)
|
||||
return
|
||||
}
|
||||
|
||||
@@ -179,13 +179,16 @@ func (e *Event) notifyListeners(eventName string, message *message.EventMessage)
|
||||
}
|
||||
}
|
||||
|
||||
// Save new listeners
|
||||
e.listeners[eventName] = newListeners
|
||||
// Save new listeners or remove entry
|
||||
if len(newListeners) > 0 {
|
||||
e.listeners[eventName] = newListeners
|
||||
} else {
|
||||
delete(e.listeners, eventName)
|
||||
}
|
||||
}
|
||||
|
||||
// Unlock
|
||||
e.notifyLock.Unlock()
|
||||
|
||||
}
|
||||
|
||||
func (e *Event) shutdown() {
|
||||
|
||||
@@ -1,9 +1,11 @@
|
||||
package subsystem
|
||||
|
||||
import (
|
||||
"strconv"
|
||||
"strings"
|
||||
|
||||
"github.com/wailsapp/wails/v2/internal/logger"
|
||||
"github.com/wailsapp/wails/v2/internal/runtime"
|
||||
"github.com/wailsapp/wails/v2/internal/servicebus"
|
||||
)
|
||||
|
||||
@@ -16,10 +18,13 @@ type Log struct {
|
||||
|
||||
// Logger!
|
||||
logger *logger.Logger
|
||||
|
||||
// Loglevel store
|
||||
logLevelStore *runtime.Store
|
||||
}
|
||||
|
||||
// NewLog creates a new log subsystem
|
||||
func NewLog(bus *servicebus.ServiceBus, logger *logger.Logger) (*Log, error) {
|
||||
func NewLog(bus *servicebus.ServiceBus, logger *logger.Logger, logLevelStore *runtime.Store) (*Log, error) {
|
||||
|
||||
// Subscribe to log messages
|
||||
logChannel, err := bus.Subscribe("log")
|
||||
@@ -34,9 +39,10 @@ func NewLog(bus *servicebus.ServiceBus, logger *logger.Logger) (*Log, error) {
|
||||
}
|
||||
|
||||
result := &Log{
|
||||
logChannel: logChannel,
|
||||
quitChannel: quitChannel,
|
||||
logger: logger,
|
||||
logChannel: logChannel,
|
||||
quitChannel: quitChannel,
|
||||
logger: logger,
|
||||
logLevelStore: logLevelStore,
|
||||
}
|
||||
|
||||
return result, nil
|
||||
@@ -57,6 +63,10 @@ func (l *Log) Start() error {
|
||||
case logMessage := <-l.logChannel:
|
||||
logType := strings.TrimPrefix(logMessage.Topic(), "log:")
|
||||
switch logType {
|
||||
case "print":
|
||||
l.logger.Print(logMessage.Data().(string))
|
||||
case "trace":
|
||||
l.logger.Trace(logMessage.Data().(string))
|
||||
case "debug":
|
||||
l.logger.Debug(logMessage.Data().(string))
|
||||
case "info":
|
||||
@@ -67,6 +77,22 @@ func (l *Log) Start() error {
|
||||
l.logger.Error(logMessage.Data().(string))
|
||||
case "fatal":
|
||||
l.logger.Fatal(logMessage.Data().(string))
|
||||
case "setlevel":
|
||||
switch inLevel := logMessage.Data().(type) {
|
||||
case logger.LogLevel:
|
||||
l.logger.SetLogLevel(inLevel)
|
||||
l.logLevelStore.Set(inLevel)
|
||||
case string:
|
||||
uint64level, err := strconv.ParseUint(inLevel, 10, 8)
|
||||
if err != nil {
|
||||
l.logger.Error("Error parsing log level: %+v", inLevel)
|
||||
continue
|
||||
}
|
||||
level := logger.LogLevel(uint64level)
|
||||
l.logLevelStore.Set(level)
|
||||
l.logger.SetLogLevel(level)
|
||||
}
|
||||
|
||||
default:
|
||||
l.logger.Error("unknown log message: %+v", logMessage)
|
||||
}
|
||||
|
||||
@@ -5,7 +5,7 @@ import (
|
||||
"strings"
|
||||
|
||||
"github.com/wailsapp/wails/v2/internal/logger"
|
||||
"github.com/wailsapp/wails/v2/internal/runtime/goruntime"
|
||||
"github.com/wailsapp/wails/v2/internal/runtime"
|
||||
"github.com/wailsapp/wails/v2/internal/servicebus"
|
||||
)
|
||||
|
||||
@@ -19,7 +19,7 @@ type Runtime struct {
|
||||
logger logger.CustomLogger
|
||||
|
||||
// Runtime library
|
||||
runtime *goruntime.Runtime
|
||||
runtime *runtime.Runtime
|
||||
}
|
||||
|
||||
// NewRuntime creates a new runtime subsystem
|
||||
@@ -32,7 +32,7 @@ func NewRuntime(bus *servicebus.ServiceBus, logger *logger.Logger) (*Runtime, er
|
||||
}
|
||||
|
||||
// Subscribe to log messages
|
||||
runtimeChannel, err := bus.Subscribe("runtime")
|
||||
runtimeChannel, err := bus.Subscribe("runtime:")
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
@@ -41,7 +41,7 @@ func NewRuntime(bus *servicebus.ServiceBus, logger *logger.Logger) (*Runtime, er
|
||||
quitChannel: quitChannel,
|
||||
runtimeChannel: runtimeChannel,
|
||||
logger: logger.CustomLogger("Runtime Subsystem"),
|
||||
runtime: goruntime.New(bus),
|
||||
runtime: runtime.New(bus),
|
||||
}
|
||||
|
||||
return result, nil
|
||||
@@ -75,7 +75,7 @@ func (r *Runtime) Start() error {
|
||||
case "browser":
|
||||
err = r.processBrowserMessage(method, runtimeMessage.Data())
|
||||
default:
|
||||
fmt.Errorf("unknown log message: %+v", runtimeMessage)
|
||||
fmt.Errorf("unknown runtime message: %+v", runtimeMessage)
|
||||
}
|
||||
|
||||
// If we had an error, log it
|
||||
@@ -93,7 +93,7 @@ func (r *Runtime) Start() error {
|
||||
}
|
||||
|
||||
// GoRuntime returns the Go Runtime object
|
||||
func (r *Runtime) GoRuntime() *goruntime.Runtime {
|
||||
func (r *Runtime) GoRuntime() *runtime.Runtime {
|
||||
return r.runtime
|
||||
}
|
||||
|
||||
@@ -103,12 +103,12 @@ func (r *Runtime) shutdown() {
|
||||
|
||||
func (r *Runtime) processBrowserMessage(method string, data interface{}) error {
|
||||
switch method {
|
||||
case "openurl":
|
||||
url, ok := data.(string)
|
||||
case "open":
|
||||
target, ok := data.(string)
|
||||
if !ok {
|
||||
return fmt.Errorf("expected 1 string parameter for runtime:browser:openurl")
|
||||
return fmt.Errorf("expected 1 string parameter for runtime:browser:open")
|
||||
}
|
||||
go r.runtime.Browser.Open(url)
|
||||
go r.runtime.Browser.Open(target)
|
||||
default:
|
||||
return fmt.Errorf("unknown method runtime:browser:%s", method)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user