@altronix/cli 0.4.3 → 0.6.0

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/index.ts

@@ -1,89 +1,80 @@
-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 } from "./reboot";
+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 site id from the device")
+    .action(getNet);
+
+  program
+    .command("set-net")
+    .description("set network itnerface 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("update network interface on the device")
+    .argument("<endpoint>", "cloud service location")
+    .action(setCloud);
+
+  program.command("reboot").description("reboot the device").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 });
+  }
+})();

package/src/net.ts

@@ -0,0 +1,68 @@
+import Linq, { log } from "@altronix/device";
+import {
+  concat,
+  finalize,
+  firstValueFrom,
+  lastValueFrom,
+  map,
+  switchMap,
+  take,
+} from "rxjs";
+import { ResponseBody, ResponseMeta } from "@altronix/device";
+import { NetIp } from "@altronix/netway";
+
+export async function getNet(): Promise<void> {
+  const linq = new Linq();
+  const path = "/api/v1/net/ip";
+  const obs = linq.connections().pipe(
+    take(1),
+    switchMap(({ about }) => linq.get<ResponseBody>(about.sid, path)),
+    map((resp) => NetIp.fromCbor(resp.body)),
+    finalize(() => linq.shutdown())
+  );
+  return firstValueFrom(obs).then((net) => {
+    log.info(`request complete`, { ...net.toJson() });
+  });
+}
+
+export async function setNet(
+  ip: string,
+  sn: string,
+  gw: string
+): Promise<void> {
+  const linq = new Linq();
+  const path = "/api/v1/net/ip";
+  const save = "/api/v1/exe/saveAndReboot";
+  const body = new NetIp({ ip, sn, gw, dhcp: false });
+  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 });
+  });
+}
+
+export async function setDhcp(): Promise<void> {
+  const linq = new Linq();
+  const path = "/api/v1/net/ip";
+  const save = "/api/v1/exe/saveAndReboot";
+  const body = new NetIp({ dhcp: true });
+  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/reboot.ts

@@ -0,0 +1,15 @@
+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 });
+  });
+}

package/src/stress.ts

@@ -0,0 +1,30 @@
+import { About } from "@altronix/wasm/zdk";
+import Linq, { log } from "@altronix/device";
+import { lastValueFrom, map, repeat, switchScan, take, tap } from "rxjs";
+import { CborResponseBody } from "@altronix/device/build/cbor";
+
+export async function stress(count: number): Promise<void> {
+  const linq = new Linq();
+  const path = "/api/v1/about";
+  const obs = linq.connections().pipe(
+    take(1),
+    switchScan(
+      (acc, { about }) =>
+        linq.get<CborResponseBody>(about.sid, path).pipe(
+          map((resp) => ({
+            ...About.fromCbor(resp.body).toJson(),
+            count: acc.count++,
+          })),
+          repeat(count)
+        ),
+      { count: 0 }
+    ),
+    tap({
+      next: (about) => log.info("response", { ...about }),
+      finalize: () => linq.shutdown(),
+    })
+  );
+  return lastValueFrom(obs).then(() => {
+    log.info(`stress test complete`);
+  });
+}

package/src/{update.ts → update.ts.bak}

@@ -1,98 +1,98 @@
-/*
- *  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.
- */
-import {
-  ConnectedEvent,
-  installDebugLogger,
-  getLogger,
-  CONNECTED,
-} from "@altronix/device";
-import { About, Update } from "@altronix/cbor";
-import { from, concat, defer } from "rxjs";
-import { take, filter, switchMap, concatMap, map, tap } from "rxjs/operators";
-import linq from "./linq";
-import fs from "fs";
-
-function chunks(data: Uint8Array, size: number): Uint8Array[] {
-  let arr = [];
-  let remainder = data.length % size;
-  function slicer(n: number) {
-    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;
-}
-
-installDebugLogger();
-const logger = getLogger();
-
-// Reduce a blob of binary data and convert into an Update[]
-function updateReducer(arr: Update[], data: Uint8Array, idx: number) {
-  let update = new 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);
-}
-
-export function runUpdate(file: string): Promise<void> {
-  return new Promise((resolve, reject) => {
-    const sub = linq
-      .listen()
-      .pipe(
-        filter((ev): ev is ConnectedEvent => ev.type == CONNECTED),
-        take(1),
-        switchMap(({ device }) => linq.get(device.about.sid, "/api/v1/about")),
-        map(About.fromCbor),
-        switchMap(({ sid: serial, verPrj }) => {
-          logger.info("found device", { serial, version: verPrj });
-          logger.info("sending update      :", { file });
-          return from(fs.promises.readFile(file)).pipe(
-            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$ = defer(() => linq.get(serial, urlStart));
-              const transfer$ = from(packets).pipe(
-                concatMap((u) => linq.put(serial, urlTransfer, u.cbor())),
-                map((meta) => ({ code: meta.json().code, sent, length })),
-                tap(() => sent++)
-              );
-              const finished$ = defer(() => linq.get(serial, urlFinish));
-              return concat(start$, transfer$, finished$);
-            })
-          );
-        })
-      )
-      .subscribe({
-        next: async (mesg) => {
-          logger.info("<-", { ...mesg });
-          resolve();
-        },
-        error: async (error) => (await linq.shutdown(), reject(error)),
-        complete: async () => (await linq.shutdown(), resolve()),
-      });
-
-    process.on("SIGINT", async () => {
-      await linq.shutdown();
-      sub.unsubscribe();
-    });
-  });
-}
+/*
+ *  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.
+ */
+import {
+  ConnectedEvent,
+  installDebugLogger,
+  getLogger,
+  CONNECTED,
+} from "@altronix/device";
+import { About, Update } from "@altronix/wasm/zdk";
+import { from, concat, defer } from "rxjs";
+import { take, filter, switchMap, concatMap, map, tap } from "rxjs/operators";
+import linq from "./linq";
+import fs from "fs";
+
+function chunks(data: Uint8Array, size: number): Uint8Array[] {
+  let arr = [];
+  let remainder = data.length % size;
+  function slicer(n: number) {
+    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;
+}
+
+installDebugLogger();
+const logger = getLogger();
+
+// Reduce a blob of binary data and convert into an Update[]
+function updateReducer(arr: Update[], data: Uint8Array, idx: number) {
+  let update = new 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);
+}
+
+export function runUpdate(file: string): Promise<void> {
+  return new Promise((resolve, reject) => {
+    const sub = linq
+      .listen()
+      .pipe(
+        filter((ev): ev is ConnectedEvent => ev.type == CONNECTED),
+        take(1),
+        switchMap(({ device }) => linq.get(device.about.sid, "/api/v1/about")),
+        map(About.fromCbor),
+        switchMap(({ sid: serial, verPrj }) => {
+          logger.info("found device", { serial, version: verPrj });
+          logger.info("sending update      :", { file });
+          return from(fs.promises.readFile(file)).pipe(
+            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$ = defer(() => linq.get(serial, urlStart));
+              const transfer$ = from(packets).pipe(
+                concatMap((u) => linq.put(serial, urlTransfer, u.cbor())),
+                map((meta) => ({ code: meta.json().code, sent, length })),
+                tap(() => sent++)
+              );
+              const finished$ = defer(() => linq.get(serial, urlFinish));
+              return concat(start$, transfer$, finished$);
+            })
+          );
+        })
+      )
+      .subscribe({
+        next: async (mesg) => {
+          logger.info("<-", { ...mesg });
+          resolve();
+        },
+        error: async (error) => (await linq.shutdown(), reject(error)),
+        complete: async () => (await linq.shutdown(), resolve()),
+      });
+
+    process.on("SIGINT", async () => {
+      await linq.shutdown();
+      sub.unsubscribe();
+    });
+  });
+}

package/tsconfig.json

@@ -1,29 +1,29 @@
-{
-  "compilerOptions": {
-    "target": "ES2022",
-    "module": "Node16",
-    "lib": ["ES2022"],
-    "moduleResolution": "Node16",
-    "declaration": true,
-    "composite": true,
-    "isolatedModules": true,
-    "allowSyntheticDefaultImports": true,
-    "importHelpers": true,
-    "alwaysStrict": true,
-    "sourceMap": true,
-    "forceConsistentCasingInFileNames": true,
-    "noFallthroughCasesInSwitch": true,
-    "noImplicitReturns": true,
-    "noUnusedLocals": true,
-    "noUnusedParameters": true,
-    "noImplicitAny": false,
-    "noImplicitThis": false,
-    "strictNullChecks": false,
-    "paths":{
-      "@altronix/cbor": ["../cbor"]
-    }
-  },
-  "references":[
-    {"path": "tsconfig.lib.json"}
-  ]
-}
+{
+  "compilerOptions": {
+    "target": "ES2022",
+    "module": "Node16",
+    "lib": ["ES2022"],
+    "moduleResolution": "Node16",
+    "declaration": true,
+    "composite": true,
+    "isolatedModules": true,
+    "allowSyntheticDefaultImports": true,
+    "importHelpers": true,
+    "alwaysStrict": true,
+    "sourceMap": true,
+    "forceConsistentCasingInFileNames": true,
+    "noFallthroughCasesInSwitch": true,
+    "noImplicitReturns": true,
+    "noUnusedLocals": true,
+    "noUnusedParameters": true,
+    "noImplicitAny": false,
+    "noImplicitThis": false,
+    "strictNullChecks": false,
+    "paths":{
+      "@altronix/wasm/zdk": ["../wasm/zdk"]
+    }
+  },
+  "references":[
+    {"path": "tsconfig.lib.json"}
+  ]
+}

package/tsconfig.lib.json

@@ -1,8 +1,8 @@
-{
-  "extends": "./tsconfig.json",
-  "compilerOptions": {
-    "outDir": "build",
-    "rootDir": "src"
-  },
-  "include": ["src/**/*"]
-}
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "outDir": "build",
+    "rootDir": "src"
+  },
+  "include": ["src/**/*"]
+}