Merge pull request #13 from jaculus-org/feat/lib

Implement libs (Project, Package, Registry)

Author: cubicap

package.json

@@ -20,9 +20,13 @@
         "@eslint/js": "^9.38.0",
         "@jaculus/link": "workspace:*",
         "@jaculus/project": "workspace:*",
+        "jaculus-tools": "workspace:*",
+        "@jaculus/common": "workspace:*",
+        "@obsidize/tar-browserify": "^6.3.2",
         "@types/chai": "^4.3.20",
         "@types/mocha": "^10.0.10",
         "@types/node": "^24.0.7",
+        "@types/pako": "^2.0.4",
         "@zenfs/core": "^1.11.4",
         "chai": "^5.1.2",
         "chai-bytes": "^0.1.2",
@@ -31,6 +35,7 @@
         "husky": "^9.1.7",
         "jiti": "^2.5.1",
         "mocha": "^11.7.2",
+        "pako": "^2.1.0",
         "prettier": "^3.6.2",
         "queue-fifo": "^0.2.5",
         "tsx": "^4.20.6",

packages/common/package.json

@@ -9,6 +9,12 @@
     "author": {
         "name": "Petr Kubica (cubicap)"
     },
+    "contributors": [
+        {
+            "name": "Jakub Andrýsek (JakubAndrysek)",
+            "url": "https://kubaandrysek.cz/"
+        }
+    ],
     "license": "GPL-3.0-only",
     "type": "module",
     "exports": {

packages/common/src/buffer.ts

@@ -0,0 +1,10 @@
+export function concatUint8Arrays(chunks: Uint8Array[]): Uint8Array {
+    const totalLength = chunks.reduce((sum, chunk) => sum + chunk.length, 0);
+    const result = new Uint8Array(totalLength);
+    let offset = 0;
+    for (const chunk of chunks) {
+        result.set(chunk, offset);
+        offset += chunk.length;
+    }
+    return result;
+}

packages/common/src/bundle.ts

@@ -0,0 +1,4 @@
+export interface ProjectBundle {
+    dirs: Set<string>;
+    files: Record<string, Uint8Array>;
+}

packages/common/src/index.ts

@@ -1,10 +1,4 @@
-type LogMethod = (message?: string) => void;
-
-export interface Logger {
-    error: LogMethod;
-    warn: LogMethod;
-    info: LogMethod;
-    verbose: LogMethod;
-    debug: LogMethod;
-    silly: LogMethod;
-}
+export { Logger } from "./logger.js";
+export { RequestFunction, getRequestJson, JaculusRequestError } from "./request.js";
+export { concatUint8Arrays } from "./buffer.js";
+export { type ProjectBundle } from "./bundle.js";

packages/common/src/logger.ts

@@ -0,0 +1,10 @@
+type LogMethod = (message?: string) => void;
+
+export interface Logger {
+    error: LogMethod;
+    warn: LogMethod;
+    info: LogMethod;
+    verbose: LogMethod;
+    debug: LogMethod;
+    silly: LogMethod;
+}

packages/common/src/request.ts

@@ -0,0 +1,19 @@
+export type RequestFunction = (baseUri: string, libFile: string) => Promise<Uint8Array>;
+
+export async function getRequestJson(
+    getRequest: RequestFunction,
+    baseUri: string,
+    libFile: string
+): Promise<any> {
+    return getRequest(baseUri, libFile).then((data) => {
+        const text = new TextDecoder().decode(data);
+        return JSON.parse(text);
+    });
+}
+
+export class JaculusRequestError extends Error {
+    constructor(message: string) {
+        super(message);
+        this.name = "JaculusRequestError";
+    }
+}

packages/device/package.json

@@ -9,6 +9,12 @@
     "author": {
         "name": "Petr Kubica (cubicap)"
     },
+    "contributors": [
+        {
+            "name": "Jakub Andrýsek (JakubAndrysek)",
+            "url": "https://kubaandrysek.cz/"
+        }
+    ],
     "license": "GPL-3.0-only",
     "type": "module",
     "main": "./dist/device.js",

packages/device/src/controller.ts

@@ -38,6 +38,32 @@ export const ControllerCommandStrings: Record<ControllerCommand, string> = {
     [ControllerCommand.CONFIG_ERASE]: "CONFIG_ERASE",
 };
 
+enum WifiKvNs {
+    Ssids = "wifi_net",
+    Main = "wifi_cfg",
+}
+
+enum WifiKeys {
+    Mode = "mode",
+    StaMode = "sta_mode",
+    StaSpecific = "sta_ssid",
+    StaApFallback = "sta_ap_fallback",
+    ApSsid = "ap_ssid",
+    ApPass = "ap_pass",
+    CurrentIp = "current_ip",
+}
+
+export enum WifiMode {
+    DISABLED = 0,
+    STATION = 1,
+    AP = 2,
+}
+
+export enum WifiStaMode {
+    BEST_SIGNAL = 0,
+    SPECIFIC_SSID = 1,
+}
+
 enum KeyValueDataType {
     INT64 = 0,
     FLOAT32 = 1,
@@ -82,8 +108,8 @@ export class Controller {
         return false;
     }
 
-    public start(path: string): Promise<void> {
-        this._logger?.verbose("Starting program: " + path);
+    public start(entryPoint: string = ""): Promise<void> {
+        this._logger?.verbose("Starting program: " + (entryPoint ? entryPoint : ""));
         return new TimeoutPromise(
             TIMEOUT_MS,
             (resolve, reject) => {
@@ -98,7 +124,7 @@ export class Controller {
 
                 const packet = this._out.buildPacket();
                 packet.put(ControllerCommand.START);
-                for (const c of path) {
+                for (const c of entryPoint) {
                     packet.put(c.charCodeAt(0));
                 }
                 packet.send();
@@ -449,4 +475,67 @@ export class Controller {
             }
         );
     }
+
+    // WiFi Configuration Methods
+    public async addWifiNetwork(ssid: string, password: string): Promise<void> {
+        this._logger?.verbose(`Adding WiFi network: ${ssid}`);
+        return this.configSetString(WifiKvNs.Ssids, ssid.substring(0, 15), password);
+    }
+
+    public async removeWifiNetwork(ssid: string): Promise<void> {
+        this._logger?.verbose(`Removing WiFi network: ${ssid}`);
+        return this.configErase(WifiKvNs.Ssids, ssid);
+    }
+
+    public getWifiMode(): Promise<WifiMode> {
+        return this.configGetInt(WifiKvNs.Main, WifiKeys.Mode) as Promise<WifiMode>;
+    }
+
+    public setWifiMode(mode: WifiMode): Promise<void> {
+        return this.configSetInt(WifiKvNs.Main, WifiKeys.Mode, mode);
+    }
+
+    public getWifiStaMode(): Promise<WifiStaMode> {
+        return this.configGetInt(WifiKvNs.Main, WifiKeys.StaMode) as Promise<WifiStaMode>;
+    }
+
+    public setWifiStaMode(mode: WifiStaMode): Promise<void> {
+        return this.configSetInt(WifiKvNs.Main, WifiKeys.StaMode, mode);
+    }
+
+    public getWifiStaSpecific(): Promise<string> {
+        return this.configGetString(WifiKvNs.Main, WifiKeys.StaSpecific);
+    }
+
+    public setWifiStaSpecific(ssid: string): Promise<void> {
+        return this.configSetString(WifiKvNs.Main, WifiKeys.StaSpecific, ssid);
+    }
+
+    public getWifiStaApFallback(): Promise<number> {
+        return this.configGetInt(WifiKvNs.Main, WifiKeys.StaApFallback);
+    }
+
+    public setWifiStaApFallback(enabled: boolean): Promise<void> {
+        return this.configSetInt(WifiKvNs.Main, WifiKeys.StaApFallback, enabled ? 1 : 0);
+    }
+
+    public getWifiApSsid(): Promise<string> {
+        return this.configGetString(WifiKvNs.Main, WifiKeys.ApSsid);
+    }
+
+    public setWifiApSsid(ssid: string): Promise<void> {
+        return this.configSetString(WifiKvNs.Main, WifiKeys.ApSsid, ssid);
+    }
+
+    public getWifiApPassword(): Promise<string> {
+        return this.configGetString(WifiKvNs.Main, WifiKeys.ApPass);
+    }
+
+    public setWifiApPassword(password: string): Promise<void> {
+        return this.configSetString(WifiKvNs.Main, WifiKeys.ApPass, password);
+    }
+
+    public getCurrentWifiIp(): Promise<string> {
+        return this.configGetString(WifiKvNs.Main, WifiKeys.CurrentIp);
+    }
 }

packages/device/src/device.ts

@@ -9,9 +9,11 @@ import {
 } from "@jaculus/link/muxCommunicator";
 import { CobsEncoder } from "@jaculus/link/encoders/cobs";
 import { Uploader } from "./uploader.js";
-import { Controller } from "./controller.js";
+import { Controller, WifiMode, WifiStaMode } from "./controller.js";
 
-export { Uploader, Controller };
+export { Uploader, type UploaderProgress, type UploaderProgressCallback } from "./uploader.js";
+export { type ProjectBundle } from "@jaculus/common";
+export { Controller, WifiMode, WifiStaMode };
 
 export class JacDevice {
     private _mux: Mux;