dropping postmessage trick, update window title by time & book name

goldbuick · Dec 14, 2024 · 7e4f1b1 · 7e4f1b1
1 parent 7a34529
commit 7e4f1b1
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 30 deletions.
diff --git a/zss/device/api.ts b/zss/device/api.ts
@@ -40,8 +40,12 @@ export function gadgetserver_clearscroll(sender: string, player: string) {
   hub.emit('gadgetserver:clearscroll', sender, undefined, player)
 }
 
-export function register_flush(sender: string, books: string) {
-  hub.emit('register:flush', sender, books)
+export function register_flush(
+  sender: string,
+  historylabel: string,
+  books: string,
+) {
+  hub.emit('register:flush', sender, [historylabel, books])
 }
 
 export function register_share(sender: string, player: string) {

diff --git a/zss/device/clock.ts b/zss/device/clock.ts
@@ -1,28 +1,6 @@
 import { createdevice } from 'zss/device'
 import { TICK_FPS, TICK_RATE } from 'zss/mapping/tick'
 
-type TIMEOUT_FN = () => void
-
-const timeouts: TIMEOUT_FN[] = []
-const messageName = 'zed-clock-proc'
-
-function schedule(fn: TIMEOUT_FN) {
-  timeouts.push(fn)
-  window.postMessage(messageName, '*')
-}
-
-window.addEventListener(
-  'message',
-  (event) => {
-    if (event.source == window && event.data == messageName) {
-      event.stopPropagation()
-      const fn = timeouts.shift()
-      fn?.()
-    }
-  },
-  true,
-)
-
 const clockdevice = createdevice('clock', [], () => {
   // no-op
 })
@@ -54,7 +32,7 @@ function wake() {
   }
 
   previous = now
-  schedule(wake)
+  setTimeout(wake, 1)
 }
 
 // server is ready

diff --git a/zss/device/register.ts b/zss/device/register.ts
@@ -3,7 +3,7 @@ import { createdevice } from 'zss/device'
 import { useGadgetClient } from 'zss/gadget/data/state'
 import { doasync } from 'zss/mapping/func'
 import { waitfor } from 'zss/mapping/tick'
-import { ispresent, isstring } from 'zss/mapping/types'
+import { isarray, ispresent, isstring } from 'zss/mapping/types'
 import { writecopyit, writeheader, writeoption } from 'zss/words/writeui'
 
 import {
@@ -187,8 +187,12 @@ const register = createdevice(
         }
         break
       case 'flush':
-        if (isstring(message.data)) {
-          writestate(message.data)
+        if (isarray(message.data)) {
+          const [maybehistorylabel, maybecontent] = message.data
+          if (isstring(maybehistorylabel) && isstring(maybecontent)) {
+            document.title = maybehistorylabel
+            writestate(maybecontent)
+          }
         }
         break
       case 'select':

diff --git a/zss/device/vm.ts b/zss/device/vm.ts
@@ -17,6 +17,8 @@ import {
   memoryreadflags,
   memorymessage,
   memorycleanup,
+  memoryreadbookbysoftware,
+  MEMORY_LABEL,
 } from 'zss/memory'
 import { bookreadcodepagebyaddress } from 'zss/memory/book'
 import { codepageresetstats } from 'zss/memory/codepage'
@@ -47,8 +49,13 @@ const observers: Record<string, MAYBE<UNOBSERVE_FUNC>> = {}
 // save state
 async function savestate() {
   const books = memoryreadbooklist()
-  if (books.length) {
-    register_flush(vm.name(), await compressbooks(books))
+  const mainbook = memoryreadbookbysoftware(MEMORY_LABEL.MAIN)
+  if (books.length && ispresent(mainbook)) {
+    register_flush(
+      vm.name(),
+      `${new Date().toISOString()} ${mainbook.name}`,
+      await compressbooks(books),
+    )
   }
 }