MOAR CHANGES

joeyak · joeyak · commit f62c6bc8f207 · 2019-02-02T21:25:14.000-05:00
diff --git a/buildwasm.ps1 b/buildwasm.ps1
@@ -0,0 +1,9 @@
+$os = $env:GOOS
+$env:GOOS = "js"
+$arch = $env:GOARCH
+$env:GOARCH = "wasm"
+
+go build -o main.wasm .\main.go .\stopwatch.go
+
+$env:GOOS = $os
+$env:GOARCH = $arch
diff --git a/index.html b/index.html
@@ -2,7 +2,32 @@
 <html lang="en">
 
 <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <meta charset="utf-8">
+    <script src="wasm_exec.js"></script>
+    <script>
+        const go = new Go();
+        let mod, inst;
+        WebAssembly.instantiateStreaming(fetch("main.wasm"), go.importObject).then((result) => {
+            mod = result.module
+            inst = result.instance
+            go.run(result.instance);
+        });
+
+        function disableButtons(disableStart) {
+            let startb = document.getElementById("startbutton")
+            let flipb = document.getElementById("flipbutton")
+            let stopb = document.getElementById("stopbutton")
+            if (disableStart) {
+                startb.disabled = true;
+                flipb.disabled = false;
+                stopb.disabled = false;
+            } else {
+                startb.disabled = false;
+                flipb.disabled = true;
+                stopb.disabled = true;
+            }
+        }
+    </script>
     <style>
         @font-face {
             font-family: "Px437 IBM BIOS";
@@ -17,16 +42,18 @@
         }
 
         button {
-
             background: #282828;
             color: #33FF33;
             border-color: #33FF33;
             border-style: dashed;
             font-family: "Px437 IBM BIOS";
             font-size: 20px;
             padding: 10px;
-            margin: 0 auto;
-            display: block;
+        }
+
+        button:disabled {
+            color: #1B871B;
+            border-color: #1B871B;
         }
     </style>
 </head>
@@ -35,20 +62,27 @@
     <table>
         <tr>
             <td>
-                Working: <span id="working"></span>
+                Working:
             </td>
             <td>
-                Distracted: <span id="distracted"></span>
+                <span id="working">00:00:00</span>
             </td>
         </tr>
         <tr>
             <td>
-                <br />
+                Distracted:
+            </td>
+            <td>
+                <span id="distracted">00:00:00</span>
             </td>
         </tr>
         <tr>
             <td colspan="2">
-                <button onclick="test()">Flip</button>
+                <span class="mid">
+                    <button id="startbutton" onclick="start()">Start</button>
+                    <button id="flipbutton" onclick="flip()" disabled>Flip</button>
+                    <button id="stopbutton" onclick="stop()" disabled>Stop</button>
+                </span>
             </td>
         </tr>
     </table>
diff --git a/main.go b/main.go
@@ -0,0 +1,51 @@
+package main
+
+import (
+	"syscall/js"
+	"time"
+	"unicode"
+
+	"github.com/dennwc/dom"
+)
+
+// Format Duration
+func fd(d time.Duration) string {
+	var ns string
+	var period bool
+	for _, r := range d.String() {
+		if (period && unicode.IsDigit(r)) || r == '.' {
+			period = true
+			continue
+		}
+		ns += string(r)
+	}
+	return ns
+}
+
+func main() {
+	var working stopwatch
+	var distracted stopwatch
+
+	js.Global().Set("start", js.NewCallback(func(v []js.Value) {
+		dom.GetDocument().GetElementById("startbutton")
+		working = newStopwatch(true)
+		distracted = stopwatch{}
+		js.Global().Call("disableButtons", true)
+	}))
+	js.Global().Set("flip", js.NewCallback(func(v []js.Value) {
+		working.Flip()
+		distracted.Flip()
+	}))
+	js.Global().Set("stop", js.NewCallback(func(v []js.Value) {
+		working.Stop()
+		distracted.Stop()
+		js.Global().Call("disableButtons", false)
+	}))
+
+	for {
+		dom.GetDocument().GetElementById("working").SetInnerHTML(fd(working.Elapsed()))
+		dom.GetDocument().GetElementById("distracted").SetInnerHTML(fd(distracted.Elapsed()))
+		dom.ConsoleLog("\rWorking: %s (%s)\t\tDistracted %s (%s)\t\t", fd(working.Elapsed()), fd(working.lastElapsed), fd(distracted.Elapsed()), fd(distracted.lastElapsed))
+		time.Sleep(time.Millisecond * 100)
+	}
+}
diff --git a/main.wasm b/main.wasm
diff --git a/run.ps1 b/run.ps1
@@ -0,0 +1,2 @@
+.\buildwasm.ps1
+go run .\testserver\main.go
diff --git a/stopwatch.go b/stopwatch.go
@@ -0,0 +1,51 @@
+package main
+
+import "time"
+
+type stopwatch struct {
+	elapsed     time.Duration
+	lastElapsed time.Duration
+	start       time.Time
+	lastStart   time.Time
+	isRunning   bool
+}
+
+func (s *stopwatch) Start() {
+	if !s.isRunning {
+		s.start = time.Now()
+		s.lastStart = s.start
+		s.isRunning = true
+	}
+}
+
+func (s *stopwatch) Stop() {
+	if s.isRunning {
+		s.lastElapsed = time.Since(s.lastStart)
+		s.elapsed += time.Since(s.start)
+		s.isRunning = false
+	}
+}
+
+func (s *stopwatch) Flip() {
+	if s.isRunning {
+		s.Stop()
+	} else {
+		s.Start()
+	}
+}
+
+func (s *stopwatch) Elapsed() time.Duration {
+	if s.isRunning {
+		s.elapsed += time.Since(s.start)
+		s.start = time.Now()
+	}
+	return s.elapsed
+}
+
+func newStopwatch(start bool) stopwatch {
+	var sw stopwatch
+	if start {
+		sw.Start()
+	}
+	return sw
+}
diff --git a/testserver/main.go b/testserver/main.go
@@ -0,0 +1,9 @@
+package main
+
+import (
+	"net/http"
+)
+
+func main() {
+	http.ListenAndServe(":8080", http.FileServer(http.Dir(".")))
+}
diff --git a/wasm_exec.js b/wasm_exec.js

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+.\buildwasm.ps1`
	`2`	`+go run .\testserver\main.go`