jfyne / live Goto Github PK

2021/07/22 09:02:40 ws closed with status (-1): writing to socket error: failed writeTimeout: json: error calling MarshalJSON for type json.RawMessage: invalid character 'i' in literal false (expecting 'l')

diff --git a/handler.go b/handler.go
index f0f80cb..f719909 100644
--- a/handler.go
+++ b/handler.go
@@ -354,14 +354,18 @@ func (h *Handler) _serveWS(r *http.Request, session Session, c *websocket.Conn)
                        if err := writeTimeout(ctx, time.Second*5, c, Event{T: EventError, Data: d}); err != nil {
                                return fmt.Errorf("writing to socket error: %w", err)
                        }
-               case err := <-internalErrors:
-                       if err != nil {
-                               if err := writeTimeout(ctx, time.Second*5, c, Event{T: EventError, Data: []byte(err.Error())}); err != nil {
+               case ie := <-internalErrors:
+                       if ie != nil {
+                               d, err := json.Marshal(ie.Error())
+                               if err != nil {
+                                       return fmt.Errorf("writing to socket error: %w", err)
+                               }
+                               if err := writeTimeout(ctx, time.Second*5, c, Event{T: EventError, Data: d}); err != nil {
                                        return fmt.Errorf("writing to socket error: %w", err)
                                }
                        }
                        // Something catastrophic has happened.
-                       return fmt.Errorf("read error: %w", err)
+                       return fmt.Errorf("internal error: %w", ie)
                case <-ctx.Done():
                        return nil
                }

{"t":"upload","i":1,"d":{"myFile":{}}}

package main

import (
	"bytes"
	"context"
	"io"
	"log"
	"net/http"
	"sync"
	"text/template"

	"github.com/jfyne/live"
)

type State struct {
	Inside  int
	Outside int
}

func main() {
	var mu sync.Mutex
	var inside, outside int
	h, err := live.NewHandler(live.NewCookieStore("session-name", []byte("weak-secret")))
	if err != nil {
		log.Fatal("could not create handler")
	}
	h.Render = func(ctx context.Context, data interface{}) (io.Reader, error) {
		tmpl, err := template.New("thermo").Parse(`

Hello<br/>
Outside is: {{.Outside}}
<button live-click="inside">Inside</button>
<button live-click="outside">Outside</button>
<button live-click="nothing">Nothing</button>
<details>
<summary>Advanced</summary>
Inside is: {{.Inside}}
<button live-click="inside">Inside</button>
<button live-click="outside">Outside</button>
<button live-click="nothing">Nothing</button>
</details>
<script src="/live.js"></script>
	`)
		if err != nil {
			return nil, err
		}
		var buf bytes.Buffer
		if err := tmpl.Execute(&buf, data); err != nil {
			return nil, err
		}
		return &buf, nil
	}
	h.HandleEvent("inside", func(context.Context, *live.Socket, live.Params) (interface{}, error) {
		mu.Lock()
		defer mu.Unlock()
		inside += 1

		return &State{inside, outside}, nil
	})
	h.HandleEvent("outside", func(context.Context, *live.Socket, live.Params) (interface{}, error) {
		mu.Lock()
		defer mu.Unlock()
		outside += 1

		return &State{inside, outside}, nil
	})
	h.HandleEvent("nothing", func(context.Context, *live.Socket, live.Params) (interface{}, error) {
		mu.Lock()
		defer mu.Unlock()
		return &State{inside, outside}, nil
	})

	http.Handle("/", h)
	http.Handle("/live.js", live.Javascript{})
	http.ListenAndServe(":8080", nil)
}

cd web && npm install typescript
go generate web/build.go
go generate internal/embed/embed.go
embedmd -w README.md

package main

import (
	"bytes"
	"context"
	"io"
	"log"
	"net/http"
	"sync"
	"text/template"

	"github.com/jfyne/live"
)

type State struct {
	Inside  int
	Outside int
}

func main() {
	var mu sync.Mutex
	var inside, outside int
	h, err := live.NewHandler(live.NewCookieStore("session-name", []byte("weak-secret")))
	if err != nil {
		log.Fatal("could not create handler")
	}
	h.Render = func(ctx context.Context, data interface{}) (io.Reader, error) {
		tmpl, err := template.New("thermo").Parse(`

Hello<br/>
Outside is: {{.Outside}}
<button live-click="inside">Inside</button>
<button live-click="outside">Outside</button>
<button live-click="nothing">Nothing</button>
<details>
<summary>Advanced</summary>
Inside is: {{.Inside}}
<button live-click="inside">Inside</button>
<button live-click="outside">Outside</button>
<button live-click="nothing">Nothing</button>
</details>
<script src="/live.js"></script>
	`)
		if err != nil {
			return nil, err
		}
		var buf bytes.Buffer
		if err := tmpl.Execute(&buf, data); err != nil {
			return nil, err
		}
		return &buf, nil
	}
	h.HandleEvent("inside", func(context.Context, *live.Socket, live.Params) (interface{}, error) {
		mu.Lock()
		defer mu.Unlock()
		inside += 1

		return &State{inside, outside}, nil
	})
	h.HandleEvent("outside", func(context.Context, *live.Socket, live.Params) (interface{}, error) {
		mu.Lock()
		defer mu.Unlock()
		outside += 1

		return &State{inside, outside}, nil
	})
	h.HandleEvent("nothing", func(context.Context, *live.Socket, live.Params) (interface{}, error) {
		mu.Lock()
		defer mu.Unlock()
		return &State{inside, outside}, nil
	})

	http.Handle("/", h)
	http.Handle("/live.js", live.Javascript{})
	http.ListenAndServe(":8080", nil)
}

git clone [email protected]:jfyne/live-examples.git
cd live-examples/clock
go build .
cd ..
clock/clock

$ sudo tcpdump -i lo0 -nn -s0 -A tcp port 8080
...
08:47:28.831040 IP6 ::1.8080 > ::1.50406: Flags [P.], seq 1:269, ack 810, win 6359, options [nop,nop,TS val 1005537220 ecr 1005537219], length 268: HTTP: HTTP/1.1 101 Switching Protocols
`....,[email protected].#...v.....4.....
;.G.;.G.HTTP/1.1 101 Switching Protocols
Connection: Upgrade
Sec-Websocket-Accept: J1GHBBuREgeNFGWhZQUIYbi8YQ4=
Sec-Websocket-Extensions: permessage-deflate; client_no_context_takeover; server_no_context_takeover
Upgrade: websocket
Date: Thu, 22 Jul 2021 07:47:28 GMT


08:47:28.831077 IP6 ::1.50406 > ::1.8080: Flags [.], ack 269, win 6367, options [nop,nop,TS val 1005537220 ecr 1005537220], length 0
`..f. [email protected] /.....(.....
;.G.;.G.
08:47:28.831177 IP6 ::1.8080 > ::1.50406: Flags [P.], seq 269:288, ack 810, win 6359, options [nop,nop,TS val 1005537220 ecr 1005537220], length 19: HTTP
`[email protected] /...v.....;.....
;.G.;.G...{"t":"connect"}..
08:47:28.831197 IP6 ::1.50406 > ::1.8080: Flags [.], ack 288, win 6367, options [nop,nop,TS val 1005537220 ecr 1005537220], length 0
`..f. [email protected] B.....(.....
;.G.;.G.
08:47:29.834266 IP6 ::1.8080 > ::1.50406: Flags [P.], seq 288:471, ack 810, win 6359, options [nop,nop,TS val 1005538221 ecr 1005537220], length 183: HTTP
`[email protected] B...v...........
;.K.;.G..~..{"t":"patch","d":[{"Path":[0,0],"Action":2,"HTML":"\u003ctitle\u003e 08:47:29 \u003c/title\u003e"},{"Path":[1,0],"Action":2,"HTML":"\u003ctime\u003e08:47:29\u003c/time\u003e"}]}..
08:47:29.834302 IP6 ::1.50406 > ::1.8080: Flags [.], ack 471, win 6364, options [nop,nop,TS val 1005538221 ecr 1005538221], length 0
`..f. [email protected] ......(.....
;.K.;.K.
08:47:30.839156 IP6 ::1.8080 > ::1.50406: Flags [P.], seq 471:654, ack 810, win 6359, options [nop,nop,TS val 1005539224 ecr 1005538221], length 183: HTTP
`[email protected] ....v...........
;.O.;.K..~..{"t":"patch","d":[{"Path":[0,0],"Action":2,"HTML":"\u003ctitle\u003e 08:47:30 \u003c/title\u003e"},{"Path":[1,0],"Action":2,"HTML":"\u003ctime\u003e08:47:30\u003c/time\u003e"}]}..
08:47:30.839203 IP6 ::1.50406 > ::1.8080: Flags [.], ack 654, win 6361, options [nop,nop,TS val 1005539224 ecr 1005539224], length 0
`..f. [email protected]!......(.....
;.O.;.O.
08:47:31.842699 IP6 ::1.8080 > ::1.50406: Flags [P.], seq 654:837, ack 810, win 6359, options [nop,nop,TS val 1005540226 ecr 1005539224], length 183: HTTP
`[email protected]!....v...........
;.S.;.O..~..{"t":"patch","d":[{"Path":[0,0],"Action":2,"HTML":"\u003ctitle\u003e 08:47:31 \u003c/title\u003e"},{"Path":[1,0],"Action":2,"HTML":"\u003ctime\u003e08:47:31\u003c/time\u003e"}]}..
08:47:31.842764 IP6 ::1.50406 > ::1.8080: Flags [.], ack 837, win 6358, options [nop,nop,TS val 1005540226 ecr 1005540226], length 0
`..f. [email protected]"g.....(.....
;.S.;.S.

2021/07/22 08:47:01 ws closed with status (-1): writing to socket error: failed writeTimeout: json: error calling MarshalJSON for type json.RawMessage: invalid character 'i' in literal false (expecting 'l')