Added session

.gitignore

@@ -1,5 +1,5 @@
 .DS_Store
 Thumbs.db
 .idea/
-cover.*
+cover*
 testdata/tmp/*

README.md

@@ -155,6 +155,13 @@ And that's it!
 
 NOTE: needless to say that the message can be something other than a string. A custom struct for instance!
 
+## Play with the window's session
+
+```go
+// Clear window's HTTP cache
+w.Session.ClearCache()
+```
+
 ## Handle several screens/displays
 
 ```go
@@ -376,15 +383,14 @@ In your webserver add one of the following javascript to achieve any kind of dia
 - [x] dialogs (open or save file, alerts, ...)
 - [x] tray
 - [x] bundler
+- [x] session
 - [ ] loader
 - [ ] accelerators (shortcuts)
 - [ ] file methods (drag & drop, ...)
 - [ ] clipboard methods
 - [ ] power monitor events (suspend, resume, ...)
 - [ ] notifications (macosx)
 - [ ] desktop capturer (audio and video)
-- [ ] session methods
-- [ ] session events
 - [ ] window advanced options (add missing ones)
 - [ ] window advanced methods (add missing ones)
 - [ ] window advanced events (add missing ones)

astilectron.go

@@ -19,7 +19,7 @@ import (
 
 // Versions
 const (
-	VersionAstilectron = "0.12.0"
+	VersionAstilectron = "0.13.0"
 	VersionElectron    = "1.8.1"
 )
 

event.go

@@ -26,6 +26,7 @@ type Event struct {
 	MenuItemPosition *int              `json:"menuItemPosition,omitempty"`
 	MenuPopupOptions *MenuPopupOptions `json:"menuPopupOptions,omitempty"`
 	Message          *EventMessage     `json:"message,omitempty"`
+	SessionID        string            `json:"sessionId,omitempty"`
 	TrayOptions      *TrayOptions      `json:"trayOptions,omitempty"`
 	URL              string            `json:"url,omitempty"`
 	WindowID         string            `json:"windowId,omitempty"`

session.go

@@ -0,0 +1,35 @@
+package astilectron
+
+import (
+	"context"
+
+	"github.com/asticode/go-astitools/context"
+)
+
+// Session event names
+const (
+	EventNameSessionCmdClearCache     = "session.cmd.clear.cache"
+	EventNameSessionEventClearedCache = "session.event.cleared.cache"
+	EventNameSessionEventWillDownload = "session.event.will.download"
+)
+
+// Session represents a session
+// TODO Add missing session methods
+// TODO Add missing session events
+type Session struct {
+	*object
+}
+
+// newSession creates a new session
+func newSession(parentCtx context.Context, c *asticontext.Canceller, d *Dispatcher, i *identifier, w *writer) *Session {
+	return &Session{object: newObject(parentCtx, c, d, i, w)}
+}
+
+// ClearCache clears the Session's HTTP cache
+func (s *Session) ClearCache() (err error) {
+	if err = s.isActionable(); err != nil {
+		return
+	}
+	_, err = synchronousEvent(s.c, s, s.w, Event{Name: EventNameSessionCmdClearCache, TargetID: s.id}, EventNameSessionEventClearedCache)
+	return
+}

session_test.go

@@ -0,0 +1,22 @@
+package astilectron
+
+import (
+	"context"
+	"testing"
+
+	"github.com/asticode/go-astitools/context"
+)
+
+func TestSession_Actions(t *testing.T) {
+	// Init
+	var c = asticontext.NewCanceller()
+	var d = newDispatcher()
+	go d.start()
+	var i = newIdentifier()
+	var wrt = &mockedWriter{}
+	var w = newWriter(wrt)
+	var s = newSession(context.Background(), c, d, i, w)
+
+	// Actions
+	testObjectAction(t, func() error { return s.ClearCache() }, s.object, wrt, "{\"name\":\"session.cmd.clear.cache\",\"targetID\":\"1\"}\n", EventNameSessionEventClearedCache)
+}

sub_menu_test.go

@@ -20,7 +20,7 @@ func TestSubMenu_ToEvent(t *testing.T) {
 	assert.NoError(t, err)
 	s = newSubMenu(nil, w.id, []*MenuItemOptions{{Label: PtrStr("1")}, {Label: PtrStr("2")}}, asticontext.NewCanceller(), newDispatcher(), i, nil)
 	e = s.toEvent()
-	assert.Equal(t, &EventSubMenu{ID: "2", Items: []*EventMenuItem{{ID: "3", Options: &MenuItemOptions{Label: PtrStr("1")}, RootID: "1"}, {ID: "4", Options: &MenuItemOptions{Label: PtrStr("2")}, RootID: "1"}}, RootID: "1"}, e)
+	assert.Equal(t, &EventSubMenu{ID: "3", Items: []*EventMenuItem{{ID: "4", Options: &MenuItemOptions{Label: PtrStr("1")}, RootID: "1"}, {ID: "5", Options: &MenuItemOptions{Label: PtrStr("2")}, RootID: "1"}}, RootID: "1"}, e)
 }
 
 func TestSubMenu_SubMenu(t *testing.T) {

window.go

@@ -58,8 +58,9 @@ var (
 // TODO Add missing window events
 type Window struct {
 	*object
-	o   *WindowOptions
-	url *url.URL
+	o       *WindowOptions
+	Session *Session
+	url     *url.URL
 }
 
 // WindowOptions represents window options
@@ -151,6 +152,7 @@ func newWindow(o Options, url string, wo *WindowOptions, c *asticontext.Cancelle
 		o:      wo,
 		object: newObject(nil, c, d, i, wrt),
 	}
+	w.Session = newSession(w.ctx, c, d, i, wrt)
 
 	// Check app details
 	if wo.Icon == nil && o.AppIconDefaultPath != "" {
@@ -221,7 +223,7 @@ func (w *Window) Create() (err error) {
 	if err = w.isActionable(); err != nil {
 		return
 	}
-	_, err = synchronousEvent(w.c, w, w.w, Event{Name: EventNameWindowCmdCreate, TargetID: w.id, URL: w.url.String(), WindowOptions: w.o}, EventNameWindowEventDidFinishLoad)
+	_, err = synchronousEvent(w.c, w, w.w, Event{Name: EventNameWindowCmdCreate, SessionID: w.Session.id, TargetID: w.id, URL: w.url.String(), WindowOptions: w.o}, EventNameWindowEventDidFinishLoad)
 	return
 }
 

window_test.go

@@ -47,7 +47,7 @@ func TestWindow_Actions(t *testing.T) {
 	w, err = a.NewWindow("http://test.com", &WindowOptions{Center: PtrBool(true)})
 	assert.NoError(t, err)
 	testObjectAction(t, func() error { return w.CloseDevTools() }, w.object, wrt, "{\"name\":\""+EventNameWindowCmdWebContentsCloseDevTools+"\",\"targetID\":\""+w.id+"\"}\n", "")
-	testObjectAction(t, func() error { return w.Create() }, w.object, wrt, "{\"name\":\""+EventNameWindowCmdCreate+"\",\"targetID\":\""+w.id+"\",\"url\":\"http://test.com\",\"windowOptions\":{\"center\":true}}\n", EventNameWindowEventDidFinishLoad)
+	testObjectAction(t, func() error { return w.Create() }, w.object, wrt, "{\"name\":\""+EventNameWindowCmdCreate+"\",\"targetID\":\""+w.id+"\",\"sessionId\":\"4\",\"url\":\"http://test.com\",\"windowOptions\":{\"center\":true}}\n", EventNameWindowEventDidFinishLoad)
 	testObjectAction(t, func() error { return w.Destroy() }, w.object, wrt, "{\"name\":\""+EventNameWindowCmdDestroy+"\",\"targetID\":\""+w.id+"\"}\n", EventNameWindowEventClosed)
 	assert.True(t, w.IsDestroyed())
 	w, err = a.NewWindow("http://test.com", &WindowOptions{})