From fe76b714a54d02e56939abb7aac1ed22bb156f47 Mon Sep 17 00:00:00 2001
From: Emery Hemingway <ehmry@posteo.net>
Date: Sat, 6 May 2023 20:08:38 +0100
Subject: [PATCH] Use runActor proc

---
 src/Tupfile                    | 4 +++-
 src/http_translator.nim        | 4 +---
 src/json_socket_translator.nim | 6 ++----
 src/json_translator.nim        | 7 +++----
 syndicate_utils.nimble         | 2 +-
 5 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/src/Tupfile b/src/Tupfile
index f74bb65..472519d 100644
--- a/src/Tupfile
+++ b/src/Tupfile
@@ -1,2 +1,4 @@
 include_rules
-: foreach *.nim | $(SYNDICATE_PROTOCOL) ./<schema> |> !nim_bin |>
+: foreach *.nim | $(SYNDICATE_PROTOCOL) ./<schema> |> !nim_bin |> {bin}
+: foreach {bin} |> !assert_built |>
+: $(BIN_DIR)/msg |> cp %f %o |> $(BIN_DIR)/beep
diff --git a/src/http_translator.nim b/src/http_translator.nim
index 541bd60..1ee968c 100644
--- a/src/http_translator.nim
+++ b/src/http_translator.nim
@@ -30,7 +30,7 @@ proc hitch(a, b: Future[void]) =
     if f.failed: fail(b, f.error)
     else: complete(b)
 
-bootDataspace("main") do (ds: Ref; turn: var Turn):
+runActor("main") do (ds: Ref; turn: var Turn):
   connectStdio(ds, turn)
   var
     handlers: Table[seq[string], (Ref, set[HttpMethod])]
@@ -88,5 +88,3 @@ bootDataspace("main") do (ds: Ref; turn: var Turn):
     asyncCheck serve(http, port, handleRequest)
   do:
     close(http)
-
-runForever()
diff --git a/src/json_socket_translator.nim b/src/json_socket_translator.nim
index 9de24d7..91fb1b7 100644
--- a/src/json_socket_translator.nim
+++ b/src/json_socket_translator.nim
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: ☭ 2022 Emery Hemingway
+# SPDX-FileCopyrightText: ☭ Emery Hemingway
 # SPDX-License-Identifier: Unlicense
 
 import std/[asyncdispatch, asyncnet, json]
@@ -7,7 +7,7 @@ import preserves, preserves/jsonhooks, syndicate, syndicate/patterns
 
 import ./schema/config
 
-bootDataspace("main") do (root: Ref; turn: var Turn):
+runActor("main") do (root: Ref; turn: var Turn):
   connectStdio(root, turn)
   during(turn, root, ?JsonSocketTranslatorArguments) do (ds: Ref, socketPath: string):
     let socket = newAsyncSocket(
@@ -32,5 +32,3 @@ bootDataspace("main") do (root: Ref; turn: var Turn):
         asyncCheck(turn, send(socket, $js & "\n"))
       else:
         writeLine(stderr, "cannot convert assertion to JSON - ", data)
-
-runForever()
diff --git a/src/json_translator.nim b/src/json_translator.nim
index fbd47ae..b8a97c2 100644
--- a/src/json_translator.nim
+++ b/src/json_translator.nim
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: ☭ 2022 Emery Hemingway
+# SPDX-FileCopyrightText: ☭ Emery Hemingway
 # SPDX-License-Identifier: Unlicense
 
 import std/[asyncdispatch, json, os, osproc, strutils]
@@ -33,9 +33,8 @@ proc translate(output: string): Assertion =
     quit 1
   js.toPreserveHook(Ref)
 
-bootDataspace("main") do (root: Ref; turn: var Turn):
+runActor("main") do (root: Ref; turn: var Turn):
   connectStdio(root, turn)
-  onPublish(turn, root, ?JsonTranslatorArguments) do (ds: Ref):
+  during(turn, root, ?JsonTranslatorArguments) do (ds: Ref):
     message(turn, ds,  initRecord[Ref]("recv-json", runChild().translate()))
 
-runForever()
diff --git a/syndicate_utils.nimble b/syndicate_utils.nimble
index a590176..66aff4d 100644
--- a/syndicate_utils.nimble
+++ b/syndicate_utils.nimble
@@ -1,6 +1,6 @@
 # Package
 
-version = "20230505"
+version = "20230506"
 author        = "Emery Hemingway"
 description   = "Utilites for Syndicated Actors and Synit"
 license       = "unlicense"