typenative 0.4.1 → 0.5.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +171 -0
- package/README.md +62 -22
- package/ROUND2-HANDOFF.md +200 -0
- package/bin/cli.js +1 -0
- package/bin/index.js +13 -2
- package/bin/main.js +1 -0
- package/bin/node/assert.js +2 -2
- package/bin/node/async_hooks.js +1 -1
- package/bin/node/buffer.js +16 -5
- package/bin/node/child_process.js +7 -7
- package/bin/node/cluster.js +3 -3
- package/bin/node/crypto_keys.js +21 -21
- package/bin/node/dgram.js +1 -1
- package/bin/node/diagnostics_channel.js +3 -3
- package/bin/node/dns.js +2 -2
- package/bin/node/events.js +3 -3
- package/bin/node/fetch.js +2 -2
- package/bin/node/fs.js +3 -3
- package/bin/node/fs_watch.js +5 -5
- package/bin/node/http.js +3 -3
- package/bin/node/http2.js +3 -3
- package/bin/node/net.js +8 -8
- package/bin/node/path.js +17 -3
- package/bin/node/process.js +34 -11
- package/bin/node/readline.js +1 -1
- package/bin/node/registry.js +4 -1
- package/bin/node/sqlite.js +6 -6
- package/bin/node/stream.js +81 -15
- package/bin/node/stream_web.js +10 -10
- package/bin/node/system_extra.js +3 -3
- package/bin/node/test.js +674 -366
- package/bin/node/test_coverage.js +187 -0
- package/bin/node/test_report.js +1392 -0
- package/bin/node/test_run.js +575 -0
- package/bin/node/timers.js +4 -4
- package/bin/node/tls.js +5 -5
- package/bin/node/util.js +31 -7
- package/bin/node/util_extra.js +7 -7
- package/bin/node/webview.js +654 -0
- package/bin/node/worker_threads.js +1 -1
- package/bin/node/zlib.js +3 -3
- package/bin/parse-node.js +4 -0
- package/bin/transpiler.js +10390 -1178
- package/bin/version.js +1 -1
- package/conformance.md +468 -340
- package/examples/README.md +47 -10
- package/examples/desktop-notes/README.md +108 -0
- package/examples/desktop-notes/bench.mjs +125 -0
- package/examples/desktop-notes/main.ts +131 -0
- package/examples/desktop-notes/package-lock.json +726 -0
- package/examples/desktop-notes/package.json +9 -0
- package/examples/desktop-notes/ui.ts +176 -0
- package/examples/dupe-finder/README.md +76 -0
- package/examples/dupe-finder/bench.mjs +120 -0
- package/examples/dupe-finder/main.ts +87 -0
- package/examples/mandelbrot-png/README.md +65 -0
- package/examples/mandelbrot-png/bench.mjs +95 -0
- package/examples/mandelbrot-png/main.ts +98 -0
- package/examples/mandelbrot-png/preview.png +0 -0
- package/examples/marked-cli/README.md +159 -0
- package/examples/marked-cli/bench.mjs +178 -0
- package/examples/marked-cli/main.ts +292 -0
- package/examples/marked-cli/parity.mjs +185 -0
- package/examples/marked-cli/vendor/marked/LICENSE +44 -0
- package/examples/marked-cli/vendor/marked/VENDOR.md +26 -0
- package/examples/todo-cli/README.md +69 -0
- package/examples/todo-cli/bench.mjs +89 -0
- package/examples/todo-cli/main.ts +92 -0
- package/examples/yaml-cli/README.md +136 -0
- package/examples/yaml-cli/bench.mjs +265 -0
- package/examples/yaml-cli/main.ts +29 -0
- package/examples/yaml-cli/parity.mjs +156 -0
- package/examples/yaml-cli/vendor/yaml/LICENSE +13 -0
- package/examples/yaml-cli/vendor/yaml/VENDOR.md +25 -0
- package/govendor/github.com/jchv/go-webview2/LICENSE +22 -0
- package/govendor/github.com/jchv/go-webview2/README.md +21 -0
- package/govendor/github.com/jchv/go-webview2/common.go +84 -0
- package/govendor/github.com/jchv/go-webview2/go.mod +3 -0
- package/govendor/github.com/jchv/go-webview2/internal/w32/w32.go +194 -0
- package/govendor/github.com/jchv/go-webview2/internal/w32/w32_386.go +14 -0
- package/govendor/github.com/jchv/go-webview2/internal/w32/w32_64bit.go +15 -0
- package/govendor/github.com/jchv/go-webview2/pkg/edge/COREWEBVIEW2_COLOR.go +8 -0
- package/govendor/github.com/jchv/go-webview2/pkg/edge/COREWEBVIEW2_HOST_RESOURCE_ACCESS_KIND.go +9 -0
- package/govendor/github.com/jchv/go-webview2/pkg/edge/COREWEBVIEW2_KEY_EVENT_KIND.go +10 -0
- package/govendor/github.com/jchv/go-webview2/pkg/edge/COREWEBVIEW2_MOVE_FOCUS_REASON.go +9 -0
- package/govendor/github.com/jchv/go-webview2/pkg/edge/COREWEBVIEW2_PHYSICAL_KEY_STATUS.go +10 -0
- package/govendor/github.com/jchv/go-webview2/pkg/edge/COREWEBVIEW2_WEB_RESOURCE_CONTEXT.go +23 -0
- package/govendor/github.com/jchv/go-webview2/pkg/edge/ICoreWebView2AcceleratorKeyPressedEventArgs.go +78 -0
- package/govendor/github.com/jchv/go-webview2/pkg/edge/ICoreWebView2AcceleratorKeyPressedEventHandler.go +52 -0
- package/govendor/github.com/jchv/go-webview2/pkg/edge/ICoreWebView2Controller.go +132 -0
- package/govendor/github.com/jchv/go-webview2/pkg/edge/ICoreWebView2Controller2.go +74 -0
- package/govendor/github.com/jchv/go-webview2/pkg/edge/ICoreWebView2CreateCoreWebView2ControllerCompletedHandler.go +48 -0
- package/govendor/github.com/jchv/go-webview2/pkg/edge/ICoreWebView2NavigationCompletedEventArgs.go +17 -0
- package/govendor/github.com/jchv/go-webview2/pkg/edge/ICoreWebView2NavigationCompletedEventHandler.go +48 -0
- package/govendor/github.com/jchv/go-webview2/pkg/edge/ICoreWebView2Settings.go +270 -0
- package/govendor/github.com/jchv/go-webview2/pkg/edge/ICoreWebView2WebResourceRequest.go +43 -0
- package/govendor/github.com/jchv/go-webview2/pkg/edge/ICoreWebView2WebResourceRequestedEventArgs.go +51 -0
- package/govendor/github.com/jchv/go-webview2/pkg/edge/ICoreWebView2WebResourceRequestedEventHandler.go +48 -0
- package/govendor/github.com/jchv/go-webview2/pkg/edge/ICoreWebView2WebResourceResponse.go +21 -0
- package/govendor/github.com/jchv/go-webview2/pkg/edge/ICoreWebView2_2.go +21 -0
- package/govendor/github.com/jchv/go-webview2/pkg/edge/ICoreWebView2_3.go +60 -0
- package/govendor/github.com/jchv/go-webview2/pkg/edge/ICoreWebViewSettings.go +396 -0
- package/govendor/github.com/jchv/go-webview2/pkg/edge/chromium.go +361 -0
- package/govendor/github.com/jchv/go-webview2/pkg/edge/chromium_386.go +24 -0
- package/govendor/github.com/jchv/go-webview2/pkg/edge/chromium_amd64.go +22 -0
- package/govendor/github.com/jchv/go-webview2/pkg/edge/chromium_arm64.go +26 -0
- package/govendor/github.com/jchv/go-webview2/pkg/edge/comproc.go +13 -0
- package/govendor/github.com/jchv/go-webview2/pkg/edge/comproc_go17.go +51 -0
- package/govendor/github.com/jchv/go-webview2/pkg/edge/comproc_go18.go +16 -0
- package/govendor/github.com/jchv/go-webview2/pkg/edge/corewebview2.go +411 -0
- package/govendor/github.com/jchv/go-webview2/pkg/edge/guid.go +223 -0
- package/govendor/github.com/jchv/go-webview2/webview.go +482 -0
- package/govendor/github.com/jchv/go-webview2/webviewloader/README.md +3 -0
- package/govendor/github.com/jchv/go-webview2/webviewloader/module.go +153 -0
- package/govendor/github.com/jchv/go-webview2/webviewloader/module_386.go +6 -0
- package/govendor/github.com/jchv/go-webview2/webviewloader/module_amd64.go +6 -0
- package/govendor/github.com/jchv/go-webview2/webviewloader/module_arm64.go +6 -0
- package/govendor/github.com/jchv/go-webview2/webviewloader/sdk/arm64/WebView2Loader.dll +0 -0
- package/govendor/github.com/jchv/go-webview2/webviewloader/sdk/x64/WebView2Loader.dll +0 -0
- package/govendor/github.com/jchv/go-webview2/webviewloader/sdk/x86/WebView2Loader.dll +0 -0
- package/govendor/github.com/jchv/go-winloader/LICENSE.md +7 -0
- package/govendor/github.com/jchv/go-winloader/README.md +124 -0
- package/govendor/github.com/jchv/go-winloader/common.go +11 -0
- package/govendor/github.com/jchv/go-winloader/go.mod +3 -0
- package/govendor/github.com/jchv/go-winloader/internal/loader/loader.go +25 -0
- package/govendor/github.com/jchv/go-winloader/internal/loader/machine.go +53 -0
- package/govendor/github.com/jchv/go-winloader/internal/memloader/cache.go +42 -0
- package/govendor/github.com/jchv/go-winloader/internal/memloader/loader.go +253 -0
- package/govendor/github.com/jchv/go-winloader/internal/pe/export.go +76 -0
- package/govendor/github.com/jchv/go-winloader/internal/pe/format.go +522 -0
- package/govendor/github.com/jchv/go-winloader/internal/pe/import.go +106 -0
- package/govendor/github.com/jchv/go-winloader/internal/pe/module.go +91 -0
- package/govendor/github.com/jchv/go-winloader/internal/pe/reloc.go +177 -0
- package/govendor/github.com/jchv/go-winloader/internal/pe/util.go +40 -0
- package/govendor/github.com/jchv/go-winloader/internal/vmem/common.go +55 -0
- package/govendor/github.com/jchv/go-winloader/internal/vmem/memory_other.go +71 -0
- package/govendor/github.com/jchv/go-winloader/internal/vmem/memory_windows.go +179 -0
- package/govendor/github.com/jchv/go-winloader/internal/winloader/hacks_other.go +17 -0
- package/govendor/github.com/jchv/go-winloader/internal/winloader/hacks_windows.go +73 -0
- package/govendor/github.com/jchv/go-winloader/internal/winloader/loader_windows.go +64 -0
- package/govendor/github.com/jchv/go-winloader/internal/winloader/machine_windows.go +32 -0
- package/govendor/github.com/jchv/go-winloader/internal/winloader/nativearch_386.go +9 -0
- package/govendor/github.com/jchv/go-winloader/internal/winloader/nativearch_amd64.go +9 -0
- package/govendor/github.com/jchv/go-winloader/internal/winloader/nativearch_arm64.go +9 -0
- package/govendor/github.com/jchv/go-winloader/loader_other.go +24 -0
- package/govendor/github.com/jchv/go-winloader/loader_windows.go +33 -0
- package/govendor/manifest.txt +3 -1
- package/package.json +1 -1
- package/tsparser/main.go +4 -0
- package/types/typenative-npm.d.ts +190 -2
- package/types/typenative.d.ts +98 -31
|
@@ -0,0 +1,482 @@
|
|
|
1
|
+
//go:build windows
|
|
2
|
+
// +build windows
|
|
3
|
+
|
|
4
|
+
package webview2
|
|
5
|
+
|
|
6
|
+
import (
|
|
7
|
+
"encoding/json"
|
|
8
|
+
"errors"
|
|
9
|
+
"log"
|
|
10
|
+
"reflect"
|
|
11
|
+
"strconv"
|
|
12
|
+
"sync"
|
|
13
|
+
"unsafe"
|
|
14
|
+
|
|
15
|
+
"github.com/jchv/go-webview2/internal/w32"
|
|
16
|
+
"github.com/jchv/go-webview2/pkg/edge"
|
|
17
|
+
|
|
18
|
+
"golang.org/x/sys/windows"
|
|
19
|
+
)
|
|
20
|
+
|
|
21
|
+
var (
|
|
22
|
+
windowContext = map[uintptr]interface{}{}
|
|
23
|
+
windowContextSync sync.RWMutex
|
|
24
|
+
)
|
|
25
|
+
|
|
26
|
+
func getWindowContext(wnd uintptr) interface{} {
|
|
27
|
+
windowContextSync.RLock()
|
|
28
|
+
defer windowContextSync.RUnlock()
|
|
29
|
+
return windowContext[wnd]
|
|
30
|
+
}
|
|
31
|
+
|
|
32
|
+
func setWindowContext(wnd uintptr, data interface{}) {
|
|
33
|
+
windowContextSync.Lock()
|
|
34
|
+
defer windowContextSync.Unlock()
|
|
35
|
+
windowContext[wnd] = data
|
|
36
|
+
}
|
|
37
|
+
|
|
38
|
+
type browser interface {
|
|
39
|
+
Embed(hwnd uintptr) bool
|
|
40
|
+
Resize()
|
|
41
|
+
Navigate(url string)
|
|
42
|
+
NavigateToString(htmlContent string)
|
|
43
|
+
Init(script string)
|
|
44
|
+
Eval(script string)
|
|
45
|
+
NotifyParentWindowPositionChanged() error
|
|
46
|
+
Focus()
|
|
47
|
+
}
|
|
48
|
+
|
|
49
|
+
type webview struct {
|
|
50
|
+
hwnd uintptr
|
|
51
|
+
mainthread uintptr
|
|
52
|
+
browser browser
|
|
53
|
+
autofocus bool
|
|
54
|
+
maxsz w32.Point
|
|
55
|
+
minsz w32.Point
|
|
56
|
+
m sync.Mutex
|
|
57
|
+
bindings map[string]interface{}
|
|
58
|
+
dispatchq []func()
|
|
59
|
+
}
|
|
60
|
+
|
|
61
|
+
type WindowOptions struct {
|
|
62
|
+
Title string
|
|
63
|
+
Width uint
|
|
64
|
+
Height uint
|
|
65
|
+
IconId uint
|
|
66
|
+
Center bool
|
|
67
|
+
}
|
|
68
|
+
|
|
69
|
+
type WebViewOptions struct {
|
|
70
|
+
Window unsafe.Pointer
|
|
71
|
+
Debug bool
|
|
72
|
+
|
|
73
|
+
// DataPath specifies the datapath for the WebView2 runtime to use for the
|
|
74
|
+
// browser instance.
|
|
75
|
+
DataPath string
|
|
76
|
+
|
|
77
|
+
// AutoFocus will try to keep the WebView2 widget focused when the window
|
|
78
|
+
// is focused.
|
|
79
|
+
AutoFocus bool
|
|
80
|
+
|
|
81
|
+
// WindowOptions customizes the window that is created to embed the
|
|
82
|
+
// WebView2 widget.
|
|
83
|
+
WindowOptions WindowOptions
|
|
84
|
+
}
|
|
85
|
+
|
|
86
|
+
// New creates a new webview in a new window.
|
|
87
|
+
func New(debug bool) WebView { return NewWithOptions(WebViewOptions{Debug: debug}) }
|
|
88
|
+
|
|
89
|
+
// NewWindow creates a new webview using an existing window.
|
|
90
|
+
//
|
|
91
|
+
// Deprecated: Use NewWithOptions.
|
|
92
|
+
func NewWindow(debug bool, window unsafe.Pointer) WebView {
|
|
93
|
+
return NewWithOptions(WebViewOptions{Debug: debug, Window: window})
|
|
94
|
+
}
|
|
95
|
+
|
|
96
|
+
// NewWithOptions creates a new webview using the provided options.
|
|
97
|
+
func NewWithOptions(options WebViewOptions) WebView {
|
|
98
|
+
w := &webview{}
|
|
99
|
+
w.bindings = map[string]interface{}{}
|
|
100
|
+
w.autofocus = options.AutoFocus
|
|
101
|
+
|
|
102
|
+
chromium := edge.NewChromium()
|
|
103
|
+
chromium.MessageCallback = w.msgcb
|
|
104
|
+
chromium.DataPath = options.DataPath
|
|
105
|
+
chromium.SetPermission(edge.CoreWebView2PermissionKindClipboardRead, edge.CoreWebView2PermissionStateAllow)
|
|
106
|
+
|
|
107
|
+
w.browser = chromium
|
|
108
|
+
w.mainthread, _, _ = w32.Kernel32GetCurrentThreadID.Call()
|
|
109
|
+
if !w.CreateWithOptions(options.WindowOptions) {
|
|
110
|
+
return nil
|
|
111
|
+
}
|
|
112
|
+
|
|
113
|
+
settings, err := chromium.GetSettings()
|
|
114
|
+
if err != nil {
|
|
115
|
+
log.Fatal(err)
|
|
116
|
+
}
|
|
117
|
+
// disable context menu
|
|
118
|
+
err = settings.PutAreDefaultContextMenusEnabled(options.Debug)
|
|
119
|
+
if err != nil {
|
|
120
|
+
log.Fatal(err)
|
|
121
|
+
}
|
|
122
|
+
// disable developer tools
|
|
123
|
+
err = settings.PutAreDevToolsEnabled(options.Debug)
|
|
124
|
+
if err != nil {
|
|
125
|
+
log.Fatal(err)
|
|
126
|
+
}
|
|
127
|
+
|
|
128
|
+
return w
|
|
129
|
+
}
|
|
130
|
+
|
|
131
|
+
type rpcMessage struct {
|
|
132
|
+
ID int `json:"id"`
|
|
133
|
+
Method string `json:"method"`
|
|
134
|
+
Params []json.RawMessage `json:"params"`
|
|
135
|
+
}
|
|
136
|
+
|
|
137
|
+
func jsString(v interface{}) string { b, _ := json.Marshal(v); return string(b) }
|
|
138
|
+
|
|
139
|
+
func (w *webview) msgcb(msg string) {
|
|
140
|
+
d := rpcMessage{}
|
|
141
|
+
if err := json.Unmarshal([]byte(msg), &d); err != nil {
|
|
142
|
+
log.Printf("invalid RPC message: %v", err)
|
|
143
|
+
return
|
|
144
|
+
}
|
|
145
|
+
|
|
146
|
+
id := strconv.Itoa(d.ID)
|
|
147
|
+
if res, err := w.callbinding(d); err != nil {
|
|
148
|
+
w.Dispatch(func() {
|
|
149
|
+
w.Eval("window._rpc[" + id + "].reject(" + jsString(err.Error()) + "); window._rpc[" + id + "] = undefined")
|
|
150
|
+
})
|
|
151
|
+
} else if b, err := json.Marshal(res); err != nil {
|
|
152
|
+
w.Dispatch(func() {
|
|
153
|
+
w.Eval("window._rpc[" + id + "].reject(" + jsString(err.Error()) + "); window._rpc[" + id + "] = undefined")
|
|
154
|
+
})
|
|
155
|
+
} else {
|
|
156
|
+
w.Dispatch(func() {
|
|
157
|
+
w.Eval("window._rpc[" + id + "].resolve(" + string(b) + "); window._rpc[" + id + "] = undefined")
|
|
158
|
+
})
|
|
159
|
+
}
|
|
160
|
+
}
|
|
161
|
+
|
|
162
|
+
func (w *webview) callbinding(d rpcMessage) (interface{}, error) {
|
|
163
|
+
w.m.Lock()
|
|
164
|
+
f, ok := w.bindings[d.Method]
|
|
165
|
+
w.m.Unlock()
|
|
166
|
+
if !ok {
|
|
167
|
+
return nil, nil
|
|
168
|
+
}
|
|
169
|
+
|
|
170
|
+
v := reflect.ValueOf(f)
|
|
171
|
+
isVariadic := v.Type().IsVariadic()
|
|
172
|
+
numIn := v.Type().NumIn()
|
|
173
|
+
if (isVariadic && len(d.Params) < numIn-1) || (!isVariadic && len(d.Params) != numIn) {
|
|
174
|
+
return nil, errors.New("function arguments mismatch")
|
|
175
|
+
}
|
|
176
|
+
args := []reflect.Value{}
|
|
177
|
+
for i := range d.Params {
|
|
178
|
+
var arg reflect.Value
|
|
179
|
+
if isVariadic && i >= numIn-1 {
|
|
180
|
+
arg = reflect.New(v.Type().In(numIn - 1).Elem())
|
|
181
|
+
} else {
|
|
182
|
+
arg = reflect.New(v.Type().In(i))
|
|
183
|
+
}
|
|
184
|
+
if err := json.Unmarshal(d.Params[i], arg.Interface()); err != nil {
|
|
185
|
+
return nil, err
|
|
186
|
+
}
|
|
187
|
+
args = append(args, arg.Elem())
|
|
188
|
+
}
|
|
189
|
+
|
|
190
|
+
errorType := reflect.TypeOf((*error)(nil)).Elem()
|
|
191
|
+
res := v.Call(args)
|
|
192
|
+
switch len(res) {
|
|
193
|
+
case 0:
|
|
194
|
+
// No results from the function, just return nil
|
|
195
|
+
return nil, nil
|
|
196
|
+
|
|
197
|
+
case 1:
|
|
198
|
+
// One result may be a value, or an error
|
|
199
|
+
if res[0].Type().Implements(errorType) {
|
|
200
|
+
if res[0].Interface() != nil {
|
|
201
|
+
return nil, res[0].Interface().(error)
|
|
202
|
+
}
|
|
203
|
+
return nil, nil
|
|
204
|
+
}
|
|
205
|
+
return res[0].Interface(), nil
|
|
206
|
+
|
|
207
|
+
case 2:
|
|
208
|
+
// Two results: first one is value, second is error
|
|
209
|
+
if !res[1].Type().Implements(errorType) {
|
|
210
|
+
return nil, errors.New("second return value must be an error")
|
|
211
|
+
}
|
|
212
|
+
if res[1].Interface() == nil {
|
|
213
|
+
return res[0].Interface(), nil
|
|
214
|
+
}
|
|
215
|
+
return res[0].Interface(), res[1].Interface().(error)
|
|
216
|
+
|
|
217
|
+
default:
|
|
218
|
+
return nil, errors.New("unexpected number of return values")
|
|
219
|
+
}
|
|
220
|
+
}
|
|
221
|
+
|
|
222
|
+
func wndproc(hwnd, msg, wp, lp uintptr) uintptr {
|
|
223
|
+
if w, ok := getWindowContext(hwnd).(*webview); ok {
|
|
224
|
+
switch msg {
|
|
225
|
+
case w32.WMMove, w32.WMMoving:
|
|
226
|
+
_ = w.browser.NotifyParentWindowPositionChanged()
|
|
227
|
+
case w32.WMNCLButtonDown:
|
|
228
|
+
_, _, _ = w32.User32SetFocus.Call(w.hwnd)
|
|
229
|
+
r, _, _ := w32.User32DefWindowProcW.Call(hwnd, msg, wp, lp)
|
|
230
|
+
return r
|
|
231
|
+
case w32.WMSize:
|
|
232
|
+
w.browser.Resize()
|
|
233
|
+
case w32.WMActivate:
|
|
234
|
+
if wp == w32.WAInactive {
|
|
235
|
+
break
|
|
236
|
+
}
|
|
237
|
+
if w.autofocus {
|
|
238
|
+
w.browser.Focus()
|
|
239
|
+
}
|
|
240
|
+
case w32.WMClose:
|
|
241
|
+
_, _, _ = w32.User32DestroyWindow.Call(hwnd)
|
|
242
|
+
case w32.WMDestroy:
|
|
243
|
+
w.Terminate()
|
|
244
|
+
case w32.WMGetMinMaxInfo:
|
|
245
|
+
lpmmi := (*w32.MinMaxInfo)(unsafe.Pointer(lp))
|
|
246
|
+
if w.maxsz.X > 0 && w.maxsz.Y > 0 {
|
|
247
|
+
lpmmi.PtMaxSize = w.maxsz
|
|
248
|
+
lpmmi.PtMaxTrackSize = w.maxsz
|
|
249
|
+
}
|
|
250
|
+
if w.minsz.X > 0 && w.minsz.Y > 0 {
|
|
251
|
+
lpmmi.PtMinTrackSize = w.minsz
|
|
252
|
+
}
|
|
253
|
+
default:
|
|
254
|
+
r, _, _ := w32.User32DefWindowProcW.Call(hwnd, msg, wp, lp)
|
|
255
|
+
return r
|
|
256
|
+
}
|
|
257
|
+
return 0
|
|
258
|
+
}
|
|
259
|
+
r, _, _ := w32.User32DefWindowProcW.Call(hwnd, msg, wp, lp)
|
|
260
|
+
return r
|
|
261
|
+
}
|
|
262
|
+
|
|
263
|
+
func (w *webview) Create(debug bool, window unsafe.Pointer) bool {
|
|
264
|
+
// This function signature stopped making sense a long time ago.
|
|
265
|
+
// It is but legacy cruft at this point.
|
|
266
|
+
return w.CreateWithOptions(WindowOptions{})
|
|
267
|
+
}
|
|
268
|
+
|
|
269
|
+
func (w *webview) CreateWithOptions(opts WindowOptions) bool {
|
|
270
|
+
var hinstance windows.Handle
|
|
271
|
+
_ = windows.GetModuleHandleEx(0, nil, &hinstance)
|
|
272
|
+
|
|
273
|
+
var icon uintptr
|
|
274
|
+
if opts.IconId == 0 {
|
|
275
|
+
// load default icon
|
|
276
|
+
icow, _, _ := w32.User32GetSystemMetrics.Call(w32.SystemMetricsCxIcon)
|
|
277
|
+
icoh, _, _ := w32.User32GetSystemMetrics.Call(w32.SystemMetricsCyIcon)
|
|
278
|
+
icon, _, _ = w32.User32LoadImageW.Call(uintptr(hinstance), 32512, icow, icoh, 0)
|
|
279
|
+
} else {
|
|
280
|
+
// load icon from resource
|
|
281
|
+
icon, _, _ = w32.User32LoadImageW.Call(uintptr(hinstance), uintptr(opts.IconId), 1, 0, 0, w32.LR_DEFAULTSIZE|w32.LR_SHARED)
|
|
282
|
+
}
|
|
283
|
+
|
|
284
|
+
className, _ := windows.UTF16PtrFromString("webview")
|
|
285
|
+
wc := w32.WndClassExW{
|
|
286
|
+
CbSize: uint32(unsafe.Sizeof(w32.WndClassExW{})),
|
|
287
|
+
HInstance: hinstance,
|
|
288
|
+
LpszClassName: className,
|
|
289
|
+
HIcon: windows.Handle(icon),
|
|
290
|
+
HIconSm: windows.Handle(icon),
|
|
291
|
+
LpfnWndProc: windows.NewCallback(wndproc),
|
|
292
|
+
}
|
|
293
|
+
_, _, _ = w32.User32RegisterClassExW.Call(uintptr(unsafe.Pointer(&wc)))
|
|
294
|
+
|
|
295
|
+
windowName, _ := windows.UTF16PtrFromString(opts.Title)
|
|
296
|
+
|
|
297
|
+
windowWidth := opts.Width
|
|
298
|
+
if windowWidth == 0 {
|
|
299
|
+
windowWidth = 640
|
|
300
|
+
}
|
|
301
|
+
windowHeight := opts.Height
|
|
302
|
+
if windowHeight == 0 {
|
|
303
|
+
windowHeight = 480
|
|
304
|
+
}
|
|
305
|
+
|
|
306
|
+
var posX, posY uint
|
|
307
|
+
if opts.Center {
|
|
308
|
+
// get screen size
|
|
309
|
+
screenWidth, _, _ := w32.User32GetSystemMetrics.Call(w32.SM_CXSCREEN)
|
|
310
|
+
screenHeight, _, _ := w32.User32GetSystemMetrics.Call(w32.SM_CYSCREEN)
|
|
311
|
+
// calculate window position
|
|
312
|
+
posX = (uint(screenWidth) - windowWidth) / 2
|
|
313
|
+
posY = (uint(screenHeight) - windowHeight) / 2
|
|
314
|
+
} else {
|
|
315
|
+
// use default position
|
|
316
|
+
posX = w32.CW_USEDEFAULT
|
|
317
|
+
posY = w32.CW_USEDEFAULT
|
|
318
|
+
}
|
|
319
|
+
|
|
320
|
+
w.hwnd, _, _ = w32.User32CreateWindowExW.Call(
|
|
321
|
+
0,
|
|
322
|
+
uintptr(unsafe.Pointer(className)),
|
|
323
|
+
uintptr(unsafe.Pointer(windowName)),
|
|
324
|
+
0xCF0000, // WS_OVERLAPPEDWINDOW
|
|
325
|
+
uintptr(posX),
|
|
326
|
+
uintptr(posY),
|
|
327
|
+
uintptr(windowWidth),
|
|
328
|
+
uintptr(windowHeight),
|
|
329
|
+
0,
|
|
330
|
+
0,
|
|
331
|
+
uintptr(hinstance),
|
|
332
|
+
0,
|
|
333
|
+
)
|
|
334
|
+
setWindowContext(w.hwnd, w)
|
|
335
|
+
|
|
336
|
+
_, _, _ = w32.User32ShowWindow.Call(w.hwnd, w32.SWShow)
|
|
337
|
+
_, _, _ = w32.User32UpdateWindow.Call(w.hwnd)
|
|
338
|
+
_, _, _ = w32.User32SetFocus.Call(w.hwnd)
|
|
339
|
+
|
|
340
|
+
if !w.browser.Embed(w.hwnd) {
|
|
341
|
+
return false
|
|
342
|
+
}
|
|
343
|
+
w.browser.Resize()
|
|
344
|
+
return true
|
|
345
|
+
}
|
|
346
|
+
|
|
347
|
+
func (w *webview) Destroy() {
|
|
348
|
+
_, _, _ = w32.User32PostMessageW.Call(w.hwnd, w32.WMClose, 0, 0)
|
|
349
|
+
}
|
|
350
|
+
|
|
351
|
+
func (w *webview) Run() {
|
|
352
|
+
var msg w32.Msg
|
|
353
|
+
for {
|
|
354
|
+
_, _, _ = w32.User32GetMessageW.Call(
|
|
355
|
+
uintptr(unsafe.Pointer(&msg)),
|
|
356
|
+
0,
|
|
357
|
+
0,
|
|
358
|
+
0,
|
|
359
|
+
)
|
|
360
|
+
if msg.Message == w32.WMApp {
|
|
361
|
+
w.m.Lock()
|
|
362
|
+
q := append([]func(){}, w.dispatchq...)
|
|
363
|
+
w.dispatchq = []func(){}
|
|
364
|
+
w.m.Unlock()
|
|
365
|
+
for _, v := range q {
|
|
366
|
+
v()
|
|
367
|
+
}
|
|
368
|
+
} else if msg.Message == w32.WMQuit {
|
|
369
|
+
return
|
|
370
|
+
}
|
|
371
|
+
r, _, _ := w32.User32GetAncestor.Call(uintptr(msg.Hwnd), w32.GARoot)
|
|
372
|
+
r, _, _ = w32.User32IsDialogMessage.Call(r, uintptr(unsafe.Pointer(&msg)))
|
|
373
|
+
if r != 0 {
|
|
374
|
+
continue
|
|
375
|
+
}
|
|
376
|
+
_, _, _ = w32.User32TranslateMessage.Call(uintptr(unsafe.Pointer(&msg)))
|
|
377
|
+
_, _, _ = w32.User32DispatchMessageW.Call(uintptr(unsafe.Pointer(&msg)))
|
|
378
|
+
}
|
|
379
|
+
}
|
|
380
|
+
|
|
381
|
+
func (w *webview) Terminate() {
|
|
382
|
+
_, _, _ = w32.User32PostQuitMessage.Call(0)
|
|
383
|
+
}
|
|
384
|
+
|
|
385
|
+
func (w *webview) Window() unsafe.Pointer {
|
|
386
|
+
return unsafe.Pointer(w.hwnd)
|
|
387
|
+
}
|
|
388
|
+
|
|
389
|
+
func (w *webview) Navigate(url string) {
|
|
390
|
+
w.browser.Navigate(url)
|
|
391
|
+
}
|
|
392
|
+
|
|
393
|
+
func (w *webview) SetHtml(html string) {
|
|
394
|
+
w.browser.NavigateToString(html)
|
|
395
|
+
}
|
|
396
|
+
|
|
397
|
+
func (w *webview) SetTitle(title string) {
|
|
398
|
+
_title, err := windows.UTF16FromString(title)
|
|
399
|
+
if err != nil {
|
|
400
|
+
_title, _ = windows.UTF16FromString("")
|
|
401
|
+
}
|
|
402
|
+
_, _, _ = w32.User32SetWindowTextW.Call(w.hwnd, uintptr(unsafe.Pointer(&_title[0])))
|
|
403
|
+
}
|
|
404
|
+
|
|
405
|
+
func (w *webview) SetSize(width int, height int, hints Hint) {
|
|
406
|
+
index := w32.GWLStyle
|
|
407
|
+
style := w32.GetWindowLong(w.hwnd, index)
|
|
408
|
+
if hints == HintFixed {
|
|
409
|
+
style &^= (w32.WSThickFrame | w32.WSMaximizeBox)
|
|
410
|
+
} else {
|
|
411
|
+
style |= (w32.WSThickFrame | w32.WSMaximizeBox)
|
|
412
|
+
}
|
|
413
|
+
w32.SetWindowLong(w.hwnd, index, style)
|
|
414
|
+
|
|
415
|
+
if hints == HintMax {
|
|
416
|
+
w.maxsz.X = int32(width)
|
|
417
|
+
w.maxsz.Y = int32(height)
|
|
418
|
+
} else if hints == HintMin {
|
|
419
|
+
w.minsz.X = int32(width)
|
|
420
|
+
w.minsz.Y = int32(height)
|
|
421
|
+
} else {
|
|
422
|
+
r := w32.Rect{}
|
|
423
|
+
r.Left = 0
|
|
424
|
+
r.Top = 0
|
|
425
|
+
r.Right = int32(width)
|
|
426
|
+
r.Bottom = int32(height)
|
|
427
|
+
_, _, _ = w32.User32AdjustWindowRect.Call(uintptr(unsafe.Pointer(&r)), w32.WSOverlappedWindow, 0)
|
|
428
|
+
_, _, _ = w32.User32SetWindowPos.Call(
|
|
429
|
+
w.hwnd, 0, uintptr(r.Left), uintptr(r.Top), uintptr(r.Right-r.Left), uintptr(r.Bottom-r.Top),
|
|
430
|
+
w32.SWPNoZOrder|w32.SWPNoActivate|w32.SWPNoMove|w32.SWPFrameChanged)
|
|
431
|
+
w.browser.Resize()
|
|
432
|
+
}
|
|
433
|
+
}
|
|
434
|
+
|
|
435
|
+
func (w *webview) Init(js string) {
|
|
436
|
+
w.browser.Init(js)
|
|
437
|
+
}
|
|
438
|
+
|
|
439
|
+
func (w *webview) Eval(js string) {
|
|
440
|
+
w.browser.Eval(js)
|
|
441
|
+
}
|
|
442
|
+
|
|
443
|
+
func (w *webview) Dispatch(f func()) {
|
|
444
|
+
w.m.Lock()
|
|
445
|
+
w.dispatchq = append(w.dispatchq, f)
|
|
446
|
+
w.m.Unlock()
|
|
447
|
+
_, _, _ = w32.User32PostThreadMessageW.Call(w.mainthread, w32.WMApp, 0, 0)
|
|
448
|
+
}
|
|
449
|
+
|
|
450
|
+
func (w *webview) Bind(name string, f interface{}) error {
|
|
451
|
+
v := reflect.ValueOf(f)
|
|
452
|
+
if v.Kind() != reflect.Func {
|
|
453
|
+
return errors.New("only functions can be bound")
|
|
454
|
+
}
|
|
455
|
+
if n := v.Type().NumOut(); n > 2 {
|
|
456
|
+
return errors.New("function may only return a value or a value+error")
|
|
457
|
+
}
|
|
458
|
+
w.m.Lock()
|
|
459
|
+
w.bindings[name] = f
|
|
460
|
+
w.m.Unlock()
|
|
461
|
+
|
|
462
|
+
w.Init("(function() { var name = " + jsString(name) + ";" + `
|
|
463
|
+
var RPC = window._rpc = (window._rpc || {nextSeq: 1});
|
|
464
|
+
window[name] = function() {
|
|
465
|
+
var seq = RPC.nextSeq++;
|
|
466
|
+
var promise = new Promise(function(resolve, reject) {
|
|
467
|
+
RPC[seq] = {
|
|
468
|
+
resolve: resolve,
|
|
469
|
+
reject: reject,
|
|
470
|
+
};
|
|
471
|
+
});
|
|
472
|
+
window.external.invoke(JSON.stringify({
|
|
473
|
+
id: seq,
|
|
474
|
+
method: name,
|
|
475
|
+
params: Array.prototype.slice.call(arguments),
|
|
476
|
+
}));
|
|
477
|
+
return promise;
|
|
478
|
+
}
|
|
479
|
+
})()`)
|
|
480
|
+
|
|
481
|
+
return nil
|
|
482
|
+
}
|
|
@@ -0,0 +1,153 @@
|
|
|
1
|
+
package webviewloader
|
|
2
|
+
|
|
3
|
+
import (
|
|
4
|
+
"fmt"
|
|
5
|
+
"sync"
|
|
6
|
+
"unsafe"
|
|
7
|
+
|
|
8
|
+
"github.com/jchv/go-winloader"
|
|
9
|
+
"golang.org/x/sys/windows"
|
|
10
|
+
)
|
|
11
|
+
|
|
12
|
+
var (
|
|
13
|
+
nativeModule = windows.NewLazyDLL("WebView2Loader")
|
|
14
|
+
nativeCreate = nativeModule.NewProc("CreateCoreWebView2EnvironmentWithOptions")
|
|
15
|
+
nativeCompareBrowserVersions = nativeModule.NewProc("CompareBrowserVersions")
|
|
16
|
+
nativeGetAvailableCoreWebView2BrowserVersionString = nativeModule.NewProc("GetAvailableCoreWebView2BrowserVersionString")
|
|
17
|
+
|
|
18
|
+
memOnce sync.Once
|
|
19
|
+
memModule winloader.Module
|
|
20
|
+
memCreate winloader.Proc
|
|
21
|
+
memCompareBrowserVersions winloader.Proc
|
|
22
|
+
memGetAvailableCoreWebView2BrowserVersionString winloader.Proc
|
|
23
|
+
memErr error
|
|
24
|
+
)
|
|
25
|
+
|
|
26
|
+
// CompareBrowserVersions will compare the 2 given versions and return:
|
|
27
|
+
//
|
|
28
|
+
// -1 = v1 < v2
|
|
29
|
+
// 0 = v1 == v2
|
|
30
|
+
// 1 = v1 > v2
|
|
31
|
+
func CompareBrowserVersions(v1 string, v2 string) (int, error) {
|
|
32
|
+
|
|
33
|
+
_v1, err := windows.UTF16PtrFromString(v1)
|
|
34
|
+
if err != nil {
|
|
35
|
+
return 0, err
|
|
36
|
+
}
|
|
37
|
+
_v2, err := windows.UTF16PtrFromString(v2)
|
|
38
|
+
if err != nil {
|
|
39
|
+
return 0, err
|
|
40
|
+
}
|
|
41
|
+
|
|
42
|
+
nativeErr := nativeModule.Load()
|
|
43
|
+
if nativeErr == nil {
|
|
44
|
+
nativeErr = nativeCompareBrowserVersions.Find()
|
|
45
|
+
}
|
|
46
|
+
var result int
|
|
47
|
+
if nativeErr != nil {
|
|
48
|
+
err = loadFromMemory(nativeErr)
|
|
49
|
+
if err != nil {
|
|
50
|
+
return 0, fmt.Errorf("Unable to load WebView2Loader.dll from disk: %v -- or from memory: %w", nativeErr, memErr)
|
|
51
|
+
}
|
|
52
|
+
_, _, err = memCompareBrowserVersions.Call(
|
|
53
|
+
uint64(uintptr(unsafe.Pointer(_v1))),
|
|
54
|
+
uint64(uintptr(unsafe.Pointer(_v2))),
|
|
55
|
+
uint64(uintptr(unsafe.Pointer(&result))))
|
|
56
|
+
} else {
|
|
57
|
+
_, _, err = nativeCompareBrowserVersions.Call(
|
|
58
|
+
uintptr(unsafe.Pointer(_v1)),
|
|
59
|
+
uintptr(unsafe.Pointer(_v2)),
|
|
60
|
+
uintptr(unsafe.Pointer(&result)))
|
|
61
|
+
}
|
|
62
|
+
if err != windows.ERROR_SUCCESS {
|
|
63
|
+
return result, err
|
|
64
|
+
}
|
|
65
|
+
return result, nil
|
|
66
|
+
}
|
|
67
|
+
|
|
68
|
+
// GetInstalledVersion returns the installed version of the webview2 runtime.
|
|
69
|
+
// If there is no version installed, a blank string is returned.
|
|
70
|
+
func GetInstalledVersion() (string, error) {
|
|
71
|
+
// GetAvailableCoreWebView2BrowserVersionString is documented as:
|
|
72
|
+
// public STDAPI GetAvailableCoreWebView2BrowserVersionString(PCWSTR browserExecutableFolder, LPWSTR * versionInfo)
|
|
73
|
+
// where winnt.h defines STDAPI as:
|
|
74
|
+
// EXTERN_C HRESULT STDAPICALLTYPE
|
|
75
|
+
// the first part (EXTERN_C) can be ignored since it's only relevent to C++,
|
|
76
|
+
// HRESULT is return type which means it returns an integer that will be 0 (S_OK) on success,
|
|
77
|
+
// and finally STDAPICALLTYPE tells us the function uses the stdcall calling convention (what Go assumes for syscalls).
|
|
78
|
+
|
|
79
|
+
nativeErr := nativeModule.Load()
|
|
80
|
+
if nativeErr == nil {
|
|
81
|
+
nativeErr = nativeGetAvailableCoreWebView2BrowserVersionString.Find()
|
|
82
|
+
}
|
|
83
|
+
var hr uintptr
|
|
84
|
+
var result *uint16
|
|
85
|
+
if nativeErr != nil {
|
|
86
|
+
if err := loadFromMemory(nativeErr); err != nil {
|
|
87
|
+
return "", fmt.Errorf("Unable to load WebView2Loader.dll from disk: %v -- or from memory: %w", nativeErr, memErr)
|
|
88
|
+
}
|
|
89
|
+
hr64, _, _ := memGetAvailableCoreWebView2BrowserVersionString.Call(
|
|
90
|
+
uint64(uintptr(unsafe.Pointer(nil))),
|
|
91
|
+
uint64(uintptr(unsafe.Pointer(&result))))
|
|
92
|
+
hr = uintptr(hr64) // The return size of the HRESULT will be whatver native size is (i.e uintptr) and not 64-bits on 32-bit systems. In both cases it should be interpreted as 32-bits (a LONG).
|
|
93
|
+
} else {
|
|
94
|
+
hr, _, _ = nativeGetAvailableCoreWebView2BrowserVersionString.Call(
|
|
95
|
+
uintptr(unsafe.Pointer(nil)),
|
|
96
|
+
uintptr(unsafe.Pointer(&result)))
|
|
97
|
+
}
|
|
98
|
+
defer windows.CoTaskMemFree(unsafe.Pointer(result)) // Safe even if result is nil
|
|
99
|
+
if hr != uintptr(windows.S_OK) {
|
|
100
|
+
if hr&0xFFFF == uintptr(windows.ERROR_FILE_NOT_FOUND) {
|
|
101
|
+
// The lower 16-bits (the error code itself) of the HRESULT is ERROR_FILE_NOT_FOUND which means the system isn't installed.
|
|
102
|
+
return "", nil // Return a blank string but no error since we successfully detected no install.
|
|
103
|
+
}
|
|
104
|
+
return "", fmt.Errorf("GetAvailableCoreWebView2BrowserVersionString returned HRESULT 0x%X", hr)
|
|
105
|
+
}
|
|
106
|
+
version := windows.UTF16PtrToString(result) // Safe even if result is nil
|
|
107
|
+
return version, nil
|
|
108
|
+
}
|
|
109
|
+
|
|
110
|
+
// CreateCoreWebView2EnvironmentWithOptions tries to load WebviewLoader2 and
|
|
111
|
+
// call the CreateCoreWebView2EnvironmentWithOptions routine.
|
|
112
|
+
func CreateCoreWebView2EnvironmentWithOptions(browserExecutableFolder, userDataFolder *uint16, environmentOptions uintptr, environmentCompletedHandle uintptr) (uintptr, error) {
|
|
113
|
+
nativeErr := nativeModule.Load()
|
|
114
|
+
if nativeErr == nil {
|
|
115
|
+
nativeErr = nativeCreate.Find()
|
|
116
|
+
}
|
|
117
|
+
if nativeErr != nil {
|
|
118
|
+
err := loadFromMemory(nativeErr)
|
|
119
|
+
if err != nil {
|
|
120
|
+
return 0, err
|
|
121
|
+
}
|
|
122
|
+
res, _, _ := memCreate.Call(
|
|
123
|
+
uint64(uintptr(unsafe.Pointer(browserExecutableFolder))),
|
|
124
|
+
uint64(uintptr(unsafe.Pointer(userDataFolder))),
|
|
125
|
+
uint64(environmentOptions),
|
|
126
|
+
uint64(environmentCompletedHandle),
|
|
127
|
+
)
|
|
128
|
+
return uintptr(res), nil
|
|
129
|
+
}
|
|
130
|
+
res, _, _ := nativeCreate.Call(
|
|
131
|
+
uintptr(unsafe.Pointer(browserExecutableFolder)),
|
|
132
|
+
uintptr(unsafe.Pointer(userDataFolder)),
|
|
133
|
+
environmentOptions,
|
|
134
|
+
environmentCompletedHandle,
|
|
135
|
+
)
|
|
136
|
+
return res, nil
|
|
137
|
+
}
|
|
138
|
+
|
|
139
|
+
func loadFromMemory(nativeErr error) error {
|
|
140
|
+
var err error
|
|
141
|
+
// DLL is not available natively. Try loading embedded copy.
|
|
142
|
+
memOnce.Do(func() {
|
|
143
|
+
memModule, memErr = winloader.LoadFromMemory(WebView2Loader)
|
|
144
|
+
if memErr != nil {
|
|
145
|
+
err = fmt.Errorf("Unable to load WebView2Loader.dll from disk: %v -- or from memory: %w", nativeErr, memErr)
|
|
146
|
+
return
|
|
147
|
+
}
|
|
148
|
+
memCreate = memModule.Proc("CreateCoreWebView2EnvironmentWithOptions")
|
|
149
|
+
memCompareBrowserVersions = memModule.Proc("CompareBrowserVersions")
|
|
150
|
+
memGetAvailableCoreWebView2BrowserVersionString = memModule.Proc("GetAvailableCoreWebView2BrowserVersionString")
|
|
151
|
+
})
|
|
152
|
+
return err
|
|
153
|
+
}
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
# ISC License
|
|
2
|
+
|
|
3
|
+
Copyright © 2021, John Chadwick <john@jchw.io>
|
|
4
|
+
|
|
5
|
+
Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted, provided that the above copyright notice and this permission notice appear in all copies.
|
|
6
|
+
|
|
7
|
+
THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|