From 8d1497a40896429191ca864a2da035fcddf286bc Mon Sep 17 00:00:00 2001
From: Ryan Dahl <ry@tinyclouds.org>
Date: Wed, 23 May 2018 17:23:50 -0400
Subject: [PATCH] Move pubMsg to dispatch

---
 dispatch.go | 12 +++++++++---
 main.go     |  5 +----
 timers.go   |  8 +-------
 3 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/dispatch.go b/dispatch.go
index 33b1fdca9a..04a5eddbb5 100644
--- a/dispatch.go
+++ b/dispatch.go
@@ -6,6 +6,10 @@ import (
 	"sync"
 )
 
+var resChan = make(chan *BaseMsg, 10)
+var doneChan = make(chan bool)
+var wg sync.WaitGroup
+
 // There is a single global worker for this process.
 // This file should be the only part of deno that directly access it, so that
 // all interaction with V8 can go through a single point.
@@ -53,9 +57,11 @@ func Pub(channel string, payload []byte) {
 	}
 }
 
-var resChan = make(chan *BaseMsg, 10)
-var doneChan = make(chan bool)
-var wg sync.WaitGroup
+func PubMsg(channel string, msg *Msg) {
+	payload, err := proto.Marshal(msg)
+	check(err)
+	Pub(channel, payload)
+}
 
 func DispatchLoop() {
 	wg.Add(1)
diff --git a/main.go b/main.go
index e4681bfbed..68ef8fb7af 100644
--- a/main.go
+++ b/main.go
@@ -3,7 +3,6 @@ package main
 import (
 	"flag"
 	"fmt"
-	"github.com/golang/protobuf/proto"
 	"github.com/ry/v8worker2"
 	"io/ioutil"
 	"log"
@@ -66,7 +65,7 @@ func main() {
 	cwd, err := os.Getwd()
 	check(err)
 
-	out, err := proto.Marshal(&Msg{
+	PubMsg("start", &Msg{
 		Payload: &Msg_Start{
 			Start: &StartMsg{
 				Cwd:       &cwd,
@@ -77,8 +76,6 @@ func main() {
 			},
 		},
 	})
-	check(err)
-	Pub("start", out)
 
 	DispatchLoop()
 }
diff --git a/timers.go b/timers.go
index 6a395adaca..91aaf1806d 100644
--- a/timers.go
+++ b/timers.go
@@ -61,7 +61,7 @@ func (t *Timer) StartTimer() {
 			if !t.Interval {
 				t.Done = true
 			}
-			pubMsg(&Msg{
+			PubMsg("timers", &Msg{
 				Payload: &Msg_TimerReady{
 					TimerReady: &TimerReadyMsg{
 						Id:   &t.Id,
@@ -75,9 +75,3 @@ func (t *Timer) StartTimer() {
 		}
 	}()
 }
-
-func pubMsg(msg *Msg) {
-	payload, err := proto.Marshal(msg)
-	check(err)
-	Pub("timers", payload)
-}