@solidrt/cli 0.0.4 → 0.0.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solidrt/cli",
-  "version": "0.0.4",
+  "version": "0.0.5",
   "license": "MIT",
   "author": "Antoine van Wel",
   "type": "module",
@@ -19,12 +19,12 @@
     "qrcode-generator": "^2.0.4"
   },
   "optionalDependencies": {
-    "@solidrt/darwin-arm64": "0.0.4",
-    "@solidrt/linux-x64-gnu": "0.0.4",
-    "@solidrt/win32-x64-msvc": "0.0.4"
+    "@solidrt/darwin-arm64": "0.0.5",
+    "@solidrt/linux-x64-gnu": "0.0.5",
+    "@solidrt/win32-x64-msvc": "0.0.5"
   },
   "peerDependencies": {
-    "@solidrt/core": "0.0.4",
+    "@solidrt/core": "0.0.5",
     "typescript": "^5"
   },
   "devDependencies": {

package/src/args.ts

@@ -9,6 +9,7 @@ export let { values, positionals } = parseArgs({
     client: { type: "boolean", default: false },
     server: { type: "boolean", default: false },
     cache: { type: "boolean", default: false },
+    proxy: { type: "boolean", default: false },
     fps: { type: "string" },
     duration: { type: "string" },
     size: { type: "string" },
@@ -35,6 +36,7 @@ run options:
       --client              Run client only
       --server              Run server only
       --cache               Enable HTTP cache
+      --proxy               Tell connected clients to route file/dir/fetch through the dev server
       --size <WxH>          Window size (default: 1280x720)
 
 build options:

package/src/client.ts

@@ -16,7 +16,8 @@ function pipeAbovePrompt(stream: ReadableStream<Uint8Array>, out: NodeJS.WriteSt
 
 export function spawnClient() {
   let runner = requireBinary("solidrt-go")
-  let args = values.size ? ["--size", values.size] : []
+  let args: string[] = []
+  if (values.size) args.push("--size", values.size)
   state.child = Bun.spawn([runner, ...args], {
   //TODO implement dev server connection
   // state.child = Bun.spawn([runner, "--dev-server", `${DEV_HOST}:${DEV_PORT}`], {

package/src/main.ts

@@ -78,7 +78,7 @@ state.sourceDir = source ? dirname(resolve(source)) : process.cwd()
 
 if (values.cache) {
   cache.initCache({ dir: process.cwd() })
-  console.log("[cli] HTTP cache enabled (.srt-cache/)")
+  console.log("[cli] HTTP cache enabled")
 }
 
 startServer()

package/src/repl.ts

@@ -1,7 +1,7 @@
 import { createInterface } from "node:readline"
 import { resolve, dirname } from "path"
 import { readdirSync } from "node:fs"
-import { state, print, printErr, broadcastStop, shutdown } from "./util"
+import { state, print, printErr, broadcastStop, buildReload, shutdown } from "./util"
 import { bundle } from "./build"
 import { startWatcher, stopWatcher } from "./watcher"
 
@@ -37,7 +37,7 @@ async function cmdReload(args: string) {
       state.currentCode = await output.text()
     }
   }
-  let msg = JSON.stringify({ type: "reload", code: state.currentCode })
+  let msg = buildReload({ code: state.currentCode })
   if (!args) {
     for (let ws of state.clients.keys()) ws.send(msg)
     print("[cli] Sent reload to all clients")
@@ -86,8 +86,8 @@ async function cmdLoad(file: string) {
     state.currentCode = await Bun.file(path).text()
   } else if (file.endsWith(".srt.bin")) {
     let bytes = await Bun.file(path).arrayBuffer()
-    let msg = { type: "reload", bytecode: Buffer.from(bytes).toString("base64") }
-    for (let ws of state.clients.keys()) ws.send(JSON.stringify(msg))
+    let msg = buildReload({ bytecode: Buffer.from(bytes).toString("base64") })
+    for (let ws of state.clients.keys()) ws.send(msg)
     print(`[cli] Loaded ${file} (bytecode, ${bytes.byteLength} bytes)`)
     return
   } else {
@@ -97,8 +97,9 @@ async function cmdLoad(file: string) {
   state.source = path
   state.sourceDir = dirname(path)
   startWatcher()
+  let reloadMsg = buildReload({ code: state.currentCode })
   for (let ws of state.clients.keys()) {
-    ws.send(JSON.stringify({ type: "reload", code: state.currentCode }))
+    ws.send(reloadMsg)
   }
   print(`[cli] Loaded ${file}`)
 }

package/src/server.ts

@@ -3,7 +3,7 @@ import { stat as fsStat, readdir } from "node:fs/promises"
 import { networkInterfaces } from "node:os"
 import { createSocket } from "node:dgram"
 import qrcode from "qrcode-generator"
-import { DEV_HOST, DEV_PORT, state, print } from "./util"
+import { DEV_HOST, DEV_PORT, state, print, buildReload } from "./util"
 import * as cache from "./cache"
 
 function headersToObject(h: Headers): Record<string, string> {
@@ -142,7 +142,7 @@ export function startServer() {
         state.clients.set(ws, { platform: "unknown", version: "unknown" })
         print(`[cli] Client connected ${ws.remoteAddress}`)
         if (state.currentCode) {
-          ws.send(JSON.stringify({ type: "reload", code: state.currentCode }))
+          ws.send(buildReload({ code: state.currentCode }))
         }
       },
       close(ws) {

package/src/util.ts

@@ -1,4 +1,5 @@
 import { resolveBinary } from "./native"
+import { values } from "./args"
 import type { Interface as ReadlineInterface } from "node:readline"
 import type { Server as BunServer } from "bun"
 
@@ -41,6 +42,10 @@ export function printErr(...args: any[]) {
   state.rl?.prompt(true)
 }
 
+export function buildReload(payload: { code?: string | null; bytecode?: string }) {
+  return JSON.stringify({ type: "reload", proxy: values.proxy, ...payload })
+}
+
 export function broadcastStop() {
   for (let ws of state.clients.keys()) {
     ws.send(JSON.stringify({ type: "stop" }))

package/src/watcher.ts

@@ -1,6 +1,6 @@
 import { watch } from "node:fs"
 import { resolve, dirname } from "path"
-import { state, print, printErr } from "./util"
+import { state, print, printErr, buildReload } from "./util"
 import { bundle } from "./build"
 
 let currentWatcher: ReturnType<typeof watch> | null = null
@@ -32,8 +32,9 @@ export function startWatcher() {
     for (let output of result.outputs) {
       state.currentCode = await output.text()
     }
+    let msg = buildReload({ code: state.currentCode })
     for (let ws of state.clients.keys()) {
-      ws.send(JSON.stringify({ type: "reload", code: state.currentCode }))
+      ws.send(msg)
     }
   })
 }