@altronix/cli 0.5.0 → 0.6.2

package/build/update.js

@@ -1,83 +1,83 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.runUpdate = void 0;
-const tslib_1 = require("tslib");
-/*
- *  This example will listen for the first connected device and make a get
- *  request for the about data and log the about data to the console.
- */
-const device_1 = require("@altronix/device");
-const cbor_1 = require("@altronix/cbor");
-const rxjs_1 = require("rxjs");
-const operators_1 = require("rxjs/operators");
-const linq_1 = tslib_1.__importDefault(require("./linq"));
-const fs_1 = tslib_1.__importDefault(require("fs"));
-function chunks(data, size) {
-    let arr = [];
-    let remainder = data.length % size;
-    function slicer(n) {
-        for (let i = 0; i < n; i++) {
-            let idx = i * size;
-            arr.push(data.slice(idx, idx + size));
-        }
-    }
-    if (remainder == 0) {
-        slicer(data.length / size);
-    }
-    else {
-        let n = Math.ceil(data.length / size);
-        let end = size * (n - 1);
-        slicer(n - 1);
-        let last = new Uint8Array(size);
-        last.set(data.slice(end));
-        arr.push(last);
-    }
-    return arr;
-}
-(0, device_1.installDebugLogger)();
-const logger = (0, device_1.getLogger)();
-// Reduce a blob of binary data and convert into an Update[]
-function updateReducer(arr, data, idx) {
-    let update = new cbor_1.Update({ data, offset: idx * 512 });
-    // NOTE: Have to initialize the Uint8Array across binding this way
-    // https://gitlab.altronix.com/software-engineering/sdk/atx-zdk/-/issues/1
-    update.data = data;
-    return arr.concat(update);
-}
-function runUpdate(file) {
-    return new Promise((resolve, reject) => {
-        const sub = linq_1.default
-            .listen()
-            .pipe((0, operators_1.filter)((ev) => ev.type == device_1.CONNECTED), (0, operators_1.take)(1), (0, operators_1.switchMap)(({ device }) => linq_1.default.get(device.about.sid, "/api/v1/about")), (0, operators_1.map)(cbor_1.About.fromCbor), (0, operators_1.switchMap)(({ sid: serial, verPrj }) => {
-            logger.info("found device", { serial, version: verPrj });
-            logger.info("sending update      :", { file });
-            return (0, rxjs_1.from)(fs_1.default.promises.readFile(file)).pipe((0, operators_1.switchMap)((update) => {
-                // Chunk up the update file into packets and send update to device
-                const packets = chunks(update, 512).reduce(updateReducer, []);
-                const length = packets.length;
-                const urlStart = "/api/v1/update/start";
-                const urlTransfer = "/api/v1/update/transfer";
-                const urlFinish = "/api/v1/update/finish";
-                let sent = 0;
-                const start$ = (0, rxjs_1.defer)(() => linq_1.default.get(serial, urlStart));
-                const transfer$ = (0, rxjs_1.from)(packets).pipe((0, operators_1.concatMap)((u) => linq_1.default.put(serial, urlTransfer, u.cbor())), (0, operators_1.map)((meta) => ({ code: meta.json().code, sent, length })), (0, operators_1.tap)(() => sent++));
-                const finished$ = (0, rxjs_1.defer)(() => linq_1.default.get(serial, urlFinish));
-                return (0, rxjs_1.concat)(start$, transfer$, finished$);
-            }));
-        }))
-            .subscribe({
-            next: async (mesg) => {
-                logger.info("<-", { ...mesg });
-                resolve();
-            },
-            error: async (error) => (await linq_1.default.shutdown(), reject(error)),
-            complete: async () => (await linq_1.default.shutdown(), resolve()),
-        });
-        process.on("SIGINT", async () => {
-            await linq_1.default.shutdown();
-            sub.unsubscribe();
-        });
-    });
-}
-exports.runUpdate = runUpdate;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.runUpdate = void 0;
+const tslib_1 = require("tslib");
+/*
+ *  This example will listen for the first connected device and make a get
+ *  request for the about data and log the about data to the console.
+ */
+const device_1 = require("@altronix/device");
+const zdk_1 = require("@altronix/wasm/zdk");
+const rxjs_1 = require("rxjs");
+const operators_1 = require("rxjs/operators");
+const linq_1 = tslib_1.__importDefault(require("./linq"));
+const fs_1 = tslib_1.__importDefault(require("fs"));
+function chunks(data, size) {
+    let arr = [];
+    let remainder = data.length % size;
+    function slicer(n) {
+        for (let i = 0; i < n; i++) {
+            let idx = i * size;
+            arr.push(data.slice(idx, idx + size));
+        }
+    }
+    if (remainder == 0) {
+        slicer(data.length / size);
+    }
+    else {
+        let n = Math.ceil(data.length / size);
+        let end = size * (n - 1);
+        slicer(n - 1);
+        let last = new Uint8Array(size);
+        last.set(data.slice(end));
+        arr.push(last);
+    }
+    return arr;
+}
+(0, device_1.installDebugLogger)();
+const logger = (0, device_1.getLogger)();
+// Reduce a blob of binary data and convert into an Update[]
+function updateReducer(arr, data, idx) {
+    let update = new zdk_1.Update({ data, offset: idx * 512 });
+    // NOTE: Have to initialize the Uint8Array across binding this way
+    // https://gitlab.altronix.com/software-engineering/sdk/atx-zdk/-/issues/1
+    update.data = data;
+    return arr.concat(update);
+}
+function runUpdate(file) {
+    return new Promise((resolve, reject) => {
+        const sub = linq_1.default
+            .listen()
+            .pipe((0, operators_1.filter)((ev) => ev.type == device_1.CONNECTED), (0, operators_1.take)(1), (0, operators_1.switchMap)(({ device }) => linq_1.default.get(device.about.sid, "/api/v1/about")), (0, operators_1.map)(zdk_1.About.fromCbor), (0, operators_1.switchMap)(({ sid: serial, verPrj }) => {
+            logger.info("found device", { serial, version: verPrj });
+            logger.info("sending update      :", { file });
+            return (0, rxjs_1.from)(fs_1.default.promises.readFile(file)).pipe((0, operators_1.switchMap)((update) => {
+                // Chunk up the update file into packets and send update to device
+                const packets = chunks(update, 512).reduce(updateReducer, []);
+                const length = packets.length;
+                const urlStart = "/api/v1/update/start";
+                const urlTransfer = "/api/v1/update/transfer";
+                const urlFinish = "/api/v1/update/finish";
+                let sent = 0;
+                const start$ = (0, rxjs_1.defer)(() => linq_1.default.get(serial, urlStart));
+                const transfer$ = (0, rxjs_1.from)(packets).pipe((0, operators_1.concatMap)((u) => linq_1.default.put(serial, urlTransfer, u.cbor())), (0, operators_1.map)((meta) => ({ code: meta.json().code, sent, length })), (0, operators_1.tap)(() => sent++));
+                const finished$ = (0, rxjs_1.defer)(() => linq_1.default.get(serial, urlFinish));
+                return (0, rxjs_1.concat)(start$, transfer$, finished$);
+            }));
+        }))
+            .subscribe({
+            next: async (mesg) => {
+                logger.info("<-", { ...mesg });
+                resolve();
+            },
+            error: async (error) => (await linq_1.default.shutdown(), reject(error)),
+            complete: async () => (await linq_1.default.shutdown(), resolve()),
+        });
+        process.on("SIGINT", async () => {
+            await linq_1.default.shutdown();
+            sub.unsubscribe();
+        });
+    });
+}
+exports.runUpdate = runUpdate;
 //# sourceMappingURL=update.js.map

package/build/update.js.map

@@ -1 +1 @@
-{"version":3,"file":"update.js","sourceRoot":"","sources":["../src/update.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"update.js","sourceRoot":"","sources":["../src/update.ts"],"names":[],"mappings":"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"}

package/jest.config.js

@@ -1,6 +1,6 @@
-module.exports = {
-  preset: "ts-jest",
-  coverageDirectory: "coverage",
-  testEnvironment: "node",
-  testMatch: ["**/?(*.)+(spec|test).[t]s?(x)"],
-};
+module.exports = {
+  preset: "ts-jest",
+  coverageDirectory: "coverage",
+  testEnvironment: "node",
+  testMatch: ["**/?(*.)+(spec|test).[t]s?(x)"],
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@altronix/cli",
-  "version": "0.5.0",
+  "version": "0.6.2",
   "description": "",
   "bin": {
     "atx": "./bin/atx"
@@ -30,8 +30,8 @@
     "commander": "^10.0.0",
     "rxjs": "^7.6.0",
     "serialport": "^10.5.0",
-    "@altronix/cbor": "0.5.0",
-    "@altronix/device": "0.5.0"
+    "@altronix/device": "0.6.1",
+    "@altronix/wasm": "1.1.0"
   },
   "scripts": {
     "start": "node ./build/index.js",

package/src/about.ts

@@ -1,13 +1,47 @@
-import { About } from "@altronix/cbor";
-import { cliRunGet } from "./common";
-import { getLogger } from "@altronix/device";
-
-export async function getter(): Promise<null> {
-  const path = "/api/v1/about";
-  const logger = getLogger();
-  logger.debug(`GET: ${path}`);
-  return cliRunGet(path).then((data) => {
-    logger.info("<-", { ...About.fromCbor(data).json() });
-    return null;
-  });
-}
+import { About } from "@altronix/wasm/zdk";
+import Linq, { log } from "@altronix/device";
+import { finalize, firstValueFrom, map, switchMap, take } from "rxjs";
+import { ResponseBody, ResponseMeta } from "@altronix/device";
+import { cborDecodeStr } from "@altronix/netway";
+
+export async function getAbout(): Promise<void> {
+  const linq = new Linq();
+  const path = "/api/v1/about";
+  const obs = linq.connections().pipe(
+    take(1),
+    switchMap(({ about }) => linq.get<ResponseBody>(about.sid, path)),
+    map((resp) => About.fromCbor(resp.body)),
+    finalize(() => linq.shutdown())
+  );
+  return firstValueFrom(obs).then((about) => {
+    log.info(`request complete`, { ...about.toJson() });
+  });
+}
+
+export async function getSite(): Promise<void> {
+  const linq = new Linq();
+  const path = "/api/v1/about/site";
+  const obs = linq.connections().pipe(
+    take(1),
+    switchMap(({ about }) => linq.get<ResponseBody>(about.sid, path)),
+    map((resp) => ({ site: cborDecodeStr(resp.body) })),
+    finalize(() => linq.shutdown())
+  );
+  return firstValueFrom(obs).then((site) => {
+    log.info(`request complete`, { ...site });
+  });
+}
+
+export async function setSite(site: string): Promise<void> {
+  const linq = new Linq();
+  const path = "/api/v1/about/site";
+  const obs = linq.connections().pipe(
+    take(1),
+    // @ts-ignore
+    switchMap(({ about }) => linq.put<ResponseMeta>(about.sid, path, site)),
+    finalize(() => linq.shutdown())
+  );
+  return firstValueFrom(obs).then(({ meta }) => {
+    log.info(`request complete`, { code: meta.code, message: meta.mesg });
+  });
+}

package/src/cloud.ts

@@ -1,16 +1,55 @@
-import { NetCloud } from "@altronix/cbor";
-import { cliRunGet, cliRunPut } from "./common";
-import { getLogger } from "@altronix/device";
-
-export function setter(endpoint: string): Promise<void> {
-  const [ip, port] = endpoint.split(":");
-  const cbor = new NetCloud({ ip, port: parseInt(port), portEn: true });
-  return cliRunPut("/api/v1/net/cloud", cbor);
-}
-
-export async function getter(): Promise<void> {
-  const path = "/api/v1/net/cloud";
-  const logger = getLogger();
-  logger.debug(`GET ${path}`);
-  logger.info("<-", { ...NetCloud.fromCbor(await cliRunGet(path)).json() });
-}
+import { cborDecodeNum, NetCloud } from "@altronix/netway";
+import Linq, { log } from "@altronix/device";
+import { ResponseBody, ResponseMeta } from "@altronix/device";
+import {
+  concat,
+  finalize,
+  lastValueFrom,
+  map,
+  reduce,
+  switchMap,
+  take,
+} from "rxjs";
+
+export async function getCloud(): Promise<void> {
+  const linq = new Linq();
+  const path = "/api/v1/net/cloud";
+  const status = "/api/v1/net/cloud/status";
+  const obs = linq.connections().pipe(
+    take(1),
+    switchMap(({ about }) => {
+      const o0 = linq
+        .get<ResponseBody>(about.sid, path)
+        .pipe(map((resp) => NetCloud.fromCbor(resp.body).toJson()));
+      const o1 = linq
+        .get<ResponseBody>(about.sid, status)
+        .pipe(map((resp) => ({ status: cborDecodeNum(resp.body) })));
+      return concat(o0, o1);
+    }),
+    reduce((acc, curr) => ({ ...acc, ...curr })),
+    finalize(() => linq.shutdown())
+  );
+  return lastValueFrom(obs).then((cloud) => {
+    log.info(`request complete`, { ...cloud });
+  });
+}
+
+export async function setCloud(endpoint: string) {
+  const [ip, port] = endpoint.split(":");
+  const body = new NetCloud({ ip, port: parseInt(port), portEn: true });
+  const path = "/api/v1/net/cloud";
+  const save = "/api/v1/exe/saveAndReboot";
+  const linq = new Linq();
+  const obs = linq.connections().pipe(
+    take(1),
+    switchMap(({ about }) => {
+      const o0 = linq.put<ResponseMeta>(about.sid, path, body);
+      const o1 = linq.get<ResponseMeta>(about.sid, save);
+      return concat(o0, o1);
+    }),
+    finalize(() => linq.shutdown())
+  );
+  return lastValueFrom(obs).then(({ meta }) => {
+    log.info(`request complete`, { code: meta.code, message: meta.mesg });
+  });
+}

package/src/exe.ts

@@ -0,0 +1,54 @@
+import Linq, { log, ResponseMeta } from "@altronix/device";
+import { finalize, firstValueFrom, switchMap, take } from "rxjs";
+
+export async function reboot(): Promise<void> {
+  const linq = new Linq();
+  const path = "/api/v1/exe/reboot";
+  const obs = linq.connections().pipe(
+    take(1),
+    switchMap(({ about }) => linq.get<ResponseMeta>(about.sid, path)),
+    finalize(() => linq.shutdown())
+  );
+  return firstValueFrom(obs).then(({ meta }) => {
+    log.info(`request complete`, { code: meta.code, message: meta.mesg });
+  });
+}
+
+export async function save(): Promise<void> {
+  const linq = new Linq();
+  const path = "/api/v1/exe/save";
+  const obs = linq.connections().pipe(
+    take(1),
+    switchMap(({ about }) => linq.get<ResponseMeta>(about.sid, path)),
+    finalize(() => linq.shutdown())
+  );
+  return firstValueFrom(obs).then(({ meta }) => {
+    log.info(`request complete`, { code: meta.code, message: meta.mesg });
+  });
+}
+
+export async function saveAndReboot(): Promise<void> {
+  const linq = new Linq();
+  const path = "/api/v1/exe/saveAndReboot";
+  const obs = linq.connections().pipe(
+    take(1),
+    switchMap(({ about }) => linq.get<ResponseMeta>(about.sid, path)),
+    finalize(() => linq.shutdown())
+  );
+  return firstValueFrom(obs).then(({ meta }) => {
+    log.info(`request complete`, { code: meta.code, message: meta.mesg });
+  });
+}
+
+export async function erase(): Promise<void> {
+  const linq = new Linq();
+  const path = "/api/v1/exe/erase";
+  const obs = linq.connections().pipe(
+    take(1),
+    switchMap(({ about }) => linq.get<ResponseMeta>(about.sid, path)),
+    finalize(() => linq.shutdown())
+  );
+  return firstValueFrom(obs).then(({ meta }) => {
+    log.info(`request complete`, { code: meta.code, message: meta.mesg });
+  });
+}

package/src/index.ts

@@ -1,89 +1,95 @@
-import { getLogger } from "@altronix/device";
-import { program } from "commander";
-import * as poe from "./poe";
-import * as cloud from "./cloud";
-import * as ip from "./ip";
-import * as dhcp from "./dhcp";
-import * as about from "./about";
-import * as unix from "./unix";
-import * as site from "./site";
-import { runUpdate } from "./update";
-
-(async function main() {
-  getLogger().debug("starting app");
-
-  program.name("atx").description("access linq device via cli").version("TODO");
-
-  program
-    .command("get-about")
-    .description("get about data on the device")
-    .action(about.getter);
-
-  program
-    .command("get-unix")
-    .description("get current time from device")
-    .action(unix.getter);
-
-  program
-    .command("get-site")
-    .description("get site property from device")
-    .action(site.getter);
-
-  program
-    .command("set-cloud")
-    .description("update network interface on the device")
-    .argument("<endpoint>", "cloud service location")
-    .action(cloud.setter);
-
-  program
-    .command("get-cloud")
-    .description("get cloud endpoint on the device")
-    .action(cloud.getter);
-
-  program
-    .command("set-ip")
-    .description("update ip interface on the device")
-    .argument("<ip>", "set IP address")
-    .argument("<sn>", "set SN address")
-    .argument("<gw>", "set GW address")
-    .action(ip.setter);
-
-  program
-    .command("get-ip")
-    .description("get ip interface on the device")
-    .action(ip.getter);
-
-  program
-    .command("set-dhcp")
-    .description("update ip interface [DHCP]")
-    .action(dhcp.setter);
-
-  program
-    .command("set-poe-port-on")
-    .description("turn on a poe port")
-    .argument("<port>", "index of port to turn on")
-    .action(poe.setPortOn);
-
-  program
-    .command("set-poe-port-off")
-    .description("turn off a poe port")
-    .argument("<port>", "index of port to turn on")
-    .action(poe.setPortOff);
-
-  program
-    .command("get-poe-ports")
-    .description("read the poe port data")
-    .action(poe.getPorts);
-
-  program
-    .command("update")
-    .description("run firmware update from file")
-    .argument("<file>", "file to update device with")
-    .action(runUpdate);
-
-  try {
-    await program.parseAsync();
-  } catch (e) {
-    console.error(e.json ? e.json() : e);
-  }
-})();
+import { log } from "@altronix/device";
+import { program } from "commander";
+import { getAbout, getSite, setSite } from "./about";
+import { getCloud, setCloud } from "./cloud";
+import { getNet, setDhcp, setNet } from "./net";
+import { reboot, save, saveAndReboot } from "./exe";
+import { stress } from "./stress";
+
+(async function main() {
+  log.info("running cli");
+
+  program.name("atx").description("access linq device via cli").version("TODO");
+
+  program
+    .command("get-about")
+    .description("get about data on the device")
+    .action(getAbout);
+
+  program
+    .command("get-site")
+    .description("get site id from the device")
+    .action(getSite);
+
+  program
+    .command("set-site")
+    .description("set site id from the device")
+    .argument("<site>", "new site id")
+    .action(setSite);
+
+  program
+    .command("get-net")
+    .description("get network configuration from the device")
+    .action(getNet);
+
+  program
+    .command("set-net")
+    .description("set network interface into static ip mode")
+    .argument("<ip>", "the new IP address")
+    .argument("<sn>", "the new SUBNET mask")
+    .argument("<gw>", "the new GATEWAY address")
+    .action(setNet);
+
+  program
+    .command("set-dhcp")
+    .description("set network interface into DHCP mode")
+    .action(setDhcp);
+
+  program
+    .command("get-cloud")
+    .description("get cloud endpoint on the device")
+    .action(getCloud);
+
+  program
+    .command("set-cloud")
+    .description("set cloud endpoint on the device")
+    .argument("<endpoint>", "cloud service location")
+    .action(setCloud);
+
+  program
+    .command("save")
+    .description("save data to persistant storage")
+    .action(save);
+
+  program
+    .command("save-reboot")
+    .description("save data to persistant storage and reboot the device")
+    .action(saveAndReboot);
+
+  program.command("reboot").description("reboot the device").action(reboot);
+
+  program
+    .command("erase")
+    .description("erase customer settings")
+    .action(reboot);
+
+  program
+    .command("stress")
+    .description("run a stress test on a device")
+    .argument("<count>", "how many requests to make")
+    .action(stress);
+
+  /*
+  program
+    .command("update")
+    .description("run firmware update from file")
+    .argument("<file>", "file to update device with")
+    .action(runUpdate);
+  */
+
+  try {
+    await program.parseAsync();
+  } catch (e) {
+    log.error(e.message, { ...e });
+  }
+})();