windows support: stage 2 (#36)

and prepare to release v0.1.0

Author: timzaak

.github/workflows/windows_build.yml

@@ -0,0 +1,41 @@
+# This is for Test, would merge to client_build.yml
+name: fornet client windows build
+on:
+  workflow_dispatch:
+
+jobs:
+  commandLine:
+    runs-on: windows-latest
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          submodules: true
+      - name: Install Rust
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
+          target: x86_64-pc-windows-msvc
+          profile: minimal
+      - name: Set up cargo cache
+        uses: actions/cache@v3
+        with:
+          path: |
+              ~/.cargo/bin/
+              ~/.cargo/registry/index/
+              ~/.cargo/registry/cache/
+              ~/.cargo/git/db/
+              client/target/            
+          key: windows-cargo-${{ hashFiles('**/Cargo.lock') }}
+          restore-keys: windows-cargo
+
+      - name: build
+        shell: pwdsh
+        run: ./build.ps1
+
+      - name: Upload artifact
+        uses: actions/upload-artifact@v2
+        with:
+          path: release/*
+          if-no-files-found: error  
+
+

admin-web/package.json

@@ -1,6 +1,6 @@
 {
   "name": "admin-web",
-  "version": "0.0.4",
+  "version": "0.1.0",
   "private": true,
   "dependencies": {
     "@reduxjs/toolkit": "^1.9.5",

backend/README.md

@@ -1,6 +1,3 @@
-If Scala 3 is a good choice?
 
-### TODO
 
-- [ ] create IpArrange util to handle all, should be careful use. 
-- [ ] needs async runtime(thread pool) to handle push. 
+

backend/api_test/http-client.env.json

@@ -1,6 +1,7 @@
 {
   "dev": {
     "host": "http://dev.fornetcode.com/api",
-    "keycloak": "http://keycloak-dev.fornetcode.com"
+    "keycloak": "http://keycloak-dev.fornetcode.com",
+    "mqtt": "http://dev.fornetcode.com/mqtt"
   }
 }

backend/api_test/mqtt_callback.http

@@ -0,0 +1,6 @@
+###
+#@name mqtt auth
+POST {{mqtt}}/auth
+Content-Type: application/json
+
+{"clientId":"nqjKd_9K8yY","username":"rGgmdNOn3tO1am2mn/S/Rno5ijPOTTMK0XscDeXpZVnk3KEcGEL5Uk+gW91lM7JgK1TiBYyHt4o8xQUxkizUCw==","password": "PSIFTk6vYNyLu9ODdjoJfg==|1695308250|W5UghfFvbj7S3wDhfHSJsxOHnMhwBOuNRv/uipInHk21S2Qxthwc54iqCrjxfySl/xTpLHGQQ8mgBxUtz0HgCw=="}

backend/build.sbt

@@ -21,7 +21,7 @@ lazy val webSugar = RootProject(file("../third/web-sugar"))
 lazy val app = project
   .in(file("."))
   .settings(
-    version := "0.0.4",
+    version := "0.1.0",
     scalaVersion := scala3Version,
     libraryDependencies ++=
       Seq(

backend/src/main/resources/db/migration/V3__support_multiple_network.sql

@@ -1,5 +1,5 @@
 alter table network
-    add column token text not null default 'network-token';
+    add column token text not null default 'network';
 comment on column network.token is 'special token to protect from brute force';
 
 alter table node

backend/src/main/scala/com/timzaak/fornet/controller/NodeController.scala

@@ -162,9 +162,10 @@ trait NodeController(
       .findById(networkId, nodeId)
       .filter(_.status == NodeStatus.Waiting)
       .map { _ =>
+        val networkSecretId = networkDao.findById(_networkId).get.tokenId.secretId
         String(
           Base64.getEncoder.encode(
-            s"1|${config.getString("server.grpc.endpoint")}|${networkId.secretId}|${nodeId.secretId}".getBytes
+            s"1|${config.getString("server.grpc.endpoint")}|${networkSecretId}|${nodeId.secretId}".getBytes
           )
         )
       }

backend/src/main/scala/com/timzaak/fornet/dao/Device.scala

@@ -28,7 +28,7 @@ class DeviceDao(using quill: DB, hashids: Hashids) {
     if(ids.isEmpty) {
       Map.empty
     } else {
-      quill.run(quote(query[Device])).filter(v => liftQuery(ids).contains(v.id)).map(v => v.id.id -> v).toMap
+      quill.run(quote(query[Device]).filter(v => liftQuery(ids).contains(v.id))).map(v => v.id.id -> v).toMap
     }
   }
 }

backend/src/main/scala/com/timzaak/fornet/grpc/AuthGRPCController.scala

@@ -1,8 +1,5 @@
 package com.timzaak.fornet.grpc
 
-import ch.qos.logback.core.joran.action.Action
-import com.google.common.base.Charsets
-import com.google.protobuf.empty.Empty
 import com.timzaak.fornet.config.AppConfig
 import com.timzaak.fornet.controller.auth.AppAuthStrategyProvider
 import com.timzaak.fornet.dao.*
@@ -20,12 +17,8 @@ import very.util.keycloak.KeycloakJWTAuthStrategy
 import very.util.security.{ IntID, TokenID }
 import very.util.web.LogSupport
 import zio.json.*
-import zio.json.ast.{ Json, JsonCursor }
 
-import java.net.http.HttpRequest.BodyPublishers
-import java.net.http.{ HttpClient, HttpRequest }
-import java.net.{ URI, URLEncoder }
-import java.time.{ LocalDateTime, OffsetDateTime }
+import java.time.OffsetDateTime
 import scala.concurrent.Future
 import scala.util.{ Failure, Success, Try }
 
@@ -49,9 +42,9 @@ class AuthGRPCController(
   private def errorResponse(message: String) = ActionResponse(
     ActionResponse.Response.Error(message)
   )
-  private def successResponse(secretId: String) = ActionResponse(
+  private def successResponse(deviceId: TokenID) = ActionResponse(
     ActionResponse.Response.Success(
-      com.timzaak.fornet.protobuf.auth.SuccessResponse(mqttClientUrl, secretId)
+      com.timzaak.fornet.protobuf.auth.SuccessResponse(mqttClientUrl, deviceId.secretId)
     )
   )
 
@@ -181,15 +174,15 @@ class AuthGRPCController(
                 NodeStatus.Waiting,
                 NodeStatus.Normal
               )
-              successResponse(node.id.secretId)
+              successResponse(device.tokenID)
             } else {
               errorResponse("already active or error response")
             }
           case (None, Success(device), Right(networkTokenId)) =>
             createNode(networkTokenId.intId, publicKey, device) match {
               case Left(value) => errorResponse(value)
               case Right(id) =>
-                successResponse(id.secretId)
+                successResponse(device.tokenID)
             }
         }
       Future.successful(response)
@@ -245,7 +238,7 @@ class AuthGRPCController(
                 )
                 createNode(networkTokenId.intId, publicKey, device) match {
                   case Left(value) => errorResponse(value)
-                  case Right(id)   => successResponse(id.secretId)
+                  case Right(id)   => successResponse(device.tokenID)
                 }
               case (_, Left(message)) => errorResponse(message)
               case _                  => errorResponse("Illegal Arguments")