.

Author: Quafadas

.github/workflows/release.yml

@@ -57,7 +57,7 @@ jobs:
           jvm: temurin@21
 
       - name: Build the binary
-        run: mill jsls.native.nativeLink
+        run: ./mill sjsls.native.nativeLink
 
       - name: Upload artifacts
         uses: actions/upload-artifact@v4
@@ -88,12 +88,12 @@ jobs:
 
 
       - name: Build the binary
-        run: sbt buildBinaryPlatformRelease
+        run: ./mill sjsls.native.nativeLink
 
       - name: Upload artifacts
         uses: actions/upload-artifact@v4
         with:
-          path: out/release/*
+          path: out/sjsls/native/nativeLink.dest/*
           name: ${{ matrix.os }}-linux-binaries
           if-no-files-found: error
 
@@ -145,13 +145,13 @@ jobs:
           clang --version
 
       - name: Build binary (windows)
-        run: sbt buildBinaryPlatformRelease
+        run: ./mill sjsls.native.nativeLink
         shell: cmd
 
       - name: Upload artifacts
         uses: actions/upload-artifact@v4
         with:
-          path: out/release/*
+          path: out/sjsls/native/nativeLink.dest/*
           name: windows-binaries
           if-no-files-found: error
 

sjsls/package.mill

@@ -8,6 +8,9 @@ import mill.scalalib.publish.*
 import mill.contrib.buildinfo.BuildInfo
 import mill.api.Task.Simple
 import scala.util.Try
+import mill.scalanativelib.*
+import scalanativelib.api.*
+
 object `package` extends Module:
 
   trait SjslsPlatformModule extends PlatformScalaModule with FormatFixPublish:
@@ -27,10 +30,10 @@ object `package` extends Module:
     )
 
     def artifactName = "sjsls"
+  end SjslsPlatformModule
 
   object jvm extends SjslsPlatformModule:
     def moduleDeps = Seq(build.sjsls_routes.jvm)
-
     object test extends Testy with ScalaTests with BuildInfo:
       val name = "sjsls"
       val buildInfoPackageName = "sjsls"
@@ -46,9 +49,9 @@ object `package` extends Module:
       )
       override def resources = super.resources()
 
-      /**
-       * Starts a server which squats on the port we want to test with, and busts mill's cache to ensure it's always started in advance...
-       */
+      /** Starts a server which squats on the port we want to test with, and busts mill's cache to ensure it's always
+        * started in advance...
+        */
       override def forkEnv: Simple[Map[String, String]] = Task {
         squattyServer()
         super.forkEnv() ++ Map(
@@ -76,6 +79,17 @@ object `package` extends Module:
     end test
   end jvm
 
+  // Can't test playwright stuff here...
+  object native extends SjslsPlatformModule with ScalaNativeModule:
+    override def mvnDeps = super.mvnDeps() ++ Seq(
+      mvn"com.github.lolgab::scala-native-crypto::0.3.0"
+    )
+    override def scalaNativeVersion = V.scalaNativeVersion
+    def releaseMode = Task{ReleaseMode.ReleaseSize}
+    def moduleDeps = Seq(sjsls_routes.native)
+
+  end native
+
   object cacheJsLibs extends ScalaJSModule:
     def scalaVersion = V.scalaVersion
     def scalaJSVersion = V.scalaJs

sjsls/src-jvm/platformBrowser.scala

@@ -0,0 +1,15 @@
+package io.github.quafadas.sjsls
+
+import java.awt.Desktop
+import java.net.URI
+
+import scribe.Scribe
+
+import cats.effect.IO
+
+private[sjsls] def platformBrowse(uri: URI)(logger: Scribe[IO]): IO[Unit] =
+  IO(
+    if Desktop.isDesktopSupported() && Desktop.getDesktop().isSupported(Desktop.Action.BROWSE) then
+      IO(Desktop.getDesktop().browse(uri))
+    else logger.error("Desktop not supported, so can't open browser")
+  ).flatten

sjsls/src-jvm/platformCurrentPid.scala

@@ -0,0 +1,3 @@
+package io.github.quafadas.sjsls
+
+private[sjsls] def currentProcessPid(): Long = ProcessHandle.current().pid()

sjsls/src-native/platformBrowser.scala

@@ -0,0 +1,9 @@
+package io.github.quafadas.sjsls
+
+import java.net.URI
+
+import scribe.Scribe
+
+import cats.effect.IO
+
+private[sjsls] def platformBrowse(uri: URI)(logger: Scribe[IO]): IO[Unit] = IO.unit

sjsls/src-native/platformCurrentPid.scala

@@ -0,0 +1,3 @@
+package io.github.quafadas.sjsls
+
+private[sjsls] def currentProcessPid(): Long = 0L

sjsls/src/dezombify.scala

@@ -103,7 +103,7 @@ private def killProcessesOnPort(port: Port): IO[Unit] =
   else
     // macOS/Linux: use lsof if available, fallback to fuser
     // Exclude the current JVM PID to prevent accidentally killing ourselves.
-    val currentPid = ProcessHandle.current().pid()
+    val currentPid = currentProcessPid()
     val sh = s"""
     |current_pid=$currentPid
     |if command -v lsof >/dev/null 2>&1; then

sjsls/src/openBrowser.scala

@@ -14,9 +14,4 @@ def openBrowser(openBrowserAt: Option[String], port: Port)(logger: Scribe[IO]):
     case None        => logger.trace("No openBrowserAt flag set, so no browser will be opened")
     case Some(value) =>
       val openAt = URI(s"http://localhost:$port$value")
-      logger.info(s"Attempting to open browser to $openAt") >>
-        IO(
-          if Desktop.isDesktopSupported() && Desktop.getDesktop().isSupported(Desktop.Action.BROWSE) then
-            IO(Desktop.getDesktop().browse(openAt))
-          else logger.error("Desktop not supported, so can't open browser")
-        ).flatten
+      platformBrowse(openAt)(logger)

sjsls/test/src/dezombify.test.scala

@@ -9,7 +9,7 @@ import munit.CatsEffectSuite
 class DezombieTest extends CatsEffectSuite:
 
   test("That we kill off a zombie server") {
-    val portInt = 6789
+    val portInt = 6789 // Build server starts a zombie server on this port, so we can test dezombification
     val port = Port.fromInt(portInt).get
 
     val lsc = LiveServerConfig(