@altronix/cli 0.7.21 → 0.8.1

package/dist/build.js

@@ -348,9 +348,12 @@ function cmake(opts) {
 }
 function emulateBytePages(board) {
     return (board.startsWith('atsame54_xpro') ||
-        board.startsWith('netway4e1bt') ||
+        board.startsWith('netwaysp4b') ||
+        board.startsWith('netwaysp4bt') ||
         board.startsWith('netway4eb') ||
+        board.startsWith('netway4ebt') ||
         board.startsWith('netway5pq') ||
+        board.startsWith('netway5btq') ||
         board.startsWith('oa2b'));
 }
 function extraAppConfs(extraConfs, config) {
@@ -441,6 +444,9 @@ function tovoid() {
 export async function build() {
     const config = this.opts()['config'] || path.resolve('./', 'atx.json');
     const verbose = this.optsWithGlobals()['verbose'];
+    const mBoard = new RegExp(this.opts()['matchesBoard'] || '(.*)');
+    const mApplication = new RegExp(this.opts()['matchesApplication'] || '(.*)');
+    const mConfig = new RegExp(this.opts()['matchesConfig'] || '(.*)');
     const cwd = path.resolve(path.dirname(config));
     const data = await fs.promises.readFile(config, 'ascii');
     const atx = JSON.parse(data);
@@ -450,13 +456,23 @@ export async function build() {
         throw validate.errors;
     const env = path.resolve(cwd, '.env');
     dotenv.config({ path: env });
-    const apps = keys(atx.applications).flatMap((app) => {
-        return keys(app.boards).flatMap((board) => {
-            return keys(board).map((config) => westOptionsNormalize(board.__key, config, app, cwd, verbose));
+    const apps = keys(atx.applications)
+        .filter(({ __key }) => __key.match(mApplication))
+        .flatMap((app) => {
+        return keys(app.boards)
+            .filter(({ __key }) => __key.match(mBoard))
+            .flatMap((board) => {
+            return keys(board)
+                .filter(({ __key }) => __key.match(mConfig))
+                .map((config) => {
+                return westOptionsNormalize(board.__key, config, app, cwd, verbose);
+            });
         });
     });
     const bootloaders = keys(atx.bootloaders).flatMap((app) => {
-        return keys(app.boards).flatMap((board) => {
+        return keys(app.boards)
+            .filter(({ __key }) => __key.match(mBoard))
+            .flatMap((board) => {
             return keys(board).map((config) => westOptionsNormalize(board.__key, config, app, cwd, verbose));
         });
     });
@@ -492,13 +508,17 @@ export async function build() {
             dst: path.join(d, `${board}-${name}-${config}.bin`)
         };
     }))).pipe(copy(), tovoid());
-    await lastValueFrom(ready$);
-    const items = await lastValueFrom(items$);
-    const renderer = render(React.createElement(Ui, { items: items, "progress$": build$, onComplete: () => renderer.unmount() }));
-    await renderer.waitUntilExit();
-    renderer.cleanup();
-    return lastValueFrom(install$).catch((e) => {
+    try {
+        await lastValueFrom(ready$);
+        const items = await lastValueFrom(items$);
+        const renderer = render(React.createElement(Ui, { items: items, "progress$": build$, onComplete: () => renderer.unmount() }));
+        await renderer.waitUntilExit();
+        renderer.cleanup();
+        return lastValueFrom(install$);
+    }
+    catch (e) {
         if (!(e instanceof EmptyError))
             throw e;
-    });
+        console.log('nothing to build');
+    }
 }

package/dist/concurrent.d.ts

@@ -0,0 +1,2 @@
+import { Command } from 'commander';
+export declare function concurrent(this: Command, count: string): Promise<void>;

package/dist/concurrent.js

@@ -0,0 +1,26 @@
+import { Linq } from '@altronix/device';
+import logger from './logger.js';
+import { select, first } from './select.js';
+import progress from './progress.js';
+import { defer, EmptyError, finalize, merge, lastValueFrom, switchMap } from 'rxjs';
+export async function concurrent(count) {
+    logger(this.optsWithGlobals()['verbose'] ? 'silly' : 'info');
+    const linq = new Linq();
+    // const request = {
+    //   path: '/api/v1/about',
+    //   meth: METH_CONSTANTS.GET,
+    //   retry: 20,
+    //   timeout: 10000
+    // };
+    const obs$ = linq.connections().pipe(this.optsWithGlobals()['first'] ? first() : select(), switchMap((serial) => {
+        const n = parseInt(count);
+        const requests = new Array(n)
+            .fill(0)
+            .map(() => defer(() => linq.get(serial, '/api/v1/about')));
+        return merge(...requests).pipe(progress(n));
+    }), finalize(() => linq.shutdown()));
+    return lastValueFrom(obs$).catch((e) => {
+        if (!(e instanceof EmptyError))
+            throw e;
+    });
+}

package/dist/index.js

@@ -11,6 +11,8 @@ import { getCloud, setCloud } from './cloud.js';
 import { stress } from './stress.js';
 import { update } from './update.js';
 import { listen } from './listen.js';
+import { getDemo, getHello } from './sample.js';
+import { concurrent } from './concurrent.js';
 // https://stackoverflow.com/questions/8817423/why-is-dirname-not-defined-in-node-repl
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 // Parse package.json to get version
@@ -44,6 +46,9 @@ program
     .option('-A, --application', 'build applications')
     .option('-B, --bootloader', 'build bootloaders')
     .option('-W, --wasm', 'build wasm')
+    .option('--matches-board [regex]', 'board regex match expr')
+    .option('--matches-application [regex]', 'application regex match expr')
+    .option('--matches-config [regex]', 'config regex match expr')
     .option('-y, --yes', 'answer yes automatically')
     .action(build);
 const device = program
@@ -116,6 +121,25 @@ device
     .description('listen for alerts and heartbeats')
     .argument('<duration>', 'how long to listen')
     .action(listen);
+device
+    .command('concurrent')
+    .description('make a number of requests concurrently')
+    .argument('<count>', 'how many requests to make concurrently')
+    .action(concurrent);
+const sample = program
+    .command('sample')
+    .description('manage zephyr device settings')
+    .option('-p, --port <PORT>', 'listen port for incoming device connections')
+    .option('-v, --verbose', 'print extra debug informating during request')
+    .option('-f, --first', 'perform request on first device we see (any device)');
+sample
+    .command('get-demo')
+    .description('read the demo data from the sample')
+    .action(getDemo);
+sample
+    .command('get-hello')
+    .description('read the hello data from the sample')
+    .action(getHello);
 // Load plugins
 // (await plugins()).forEach(({ plugin: _, path: __, description: ___ }) => {});
 program.parseAsync().catch((e) => console.error(e));

package/dist/sample.d.ts

@@ -0,0 +1,3 @@
+import { Command } from 'commander';
+export declare function getDemo(this: Command): Promise<void>;
+export declare function getHello(this: Command): Promise<void>;

package/dist/sample.js

@@ -0,0 +1,30 @@
+// sample.tsx
+import { Demo } from '@altronix/zdk/sample';
+import { Linq } from '@altronix/device';
+import { EmptyError, finalize, firstValueFrom, map, switchMap } from 'rxjs';
+import logger from './logger.js';
+import { select, first } from './select.js';
+export async function getDemo() {
+    logger(this.optsWithGlobals()['verbose'] ? 'silly' : 'info');
+    const linq = new Linq();
+    const path = '/sample/demo';
+    const obs = linq.connections().pipe(this.optsWithGlobals()['first'] ? first() : select(), switchMap((sid) => linq.get(sid, path)), map((resp) => Demo.fromCbor(resp.body)), finalize(() => linq.shutdown()));
+    return firstValueFrom(obs)
+        .then((about) => console.log(JSON.stringify(about.toJson(), null, 2)))
+        .catch((e) => {
+        if (!(e instanceof EmptyError))
+            throw e;
+    });
+}
+export async function getHello() {
+    logger(this.optsWithGlobals()['verbose'] ? 'silly' : 'info');
+    const linq = new Linq();
+    const path = '/sample/hello';
+    const obs = linq.connections().pipe(this.optsWithGlobals()['first'] ? first() : select(), switchMap((sid) => linq.get(sid, path)), map((resp) => JSON.parse(new TextDecoder().decode(resp.body))), finalize(() => linq.shutdown()));
+    return firstValueFrom(obs)
+        .then((about) => console.log(JSON.stringify(about, null, 2)))
+        .catch((e) => {
+        if (!(e instanceof EmptyError))
+            throw e;
+    });
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@altronix/cli",
-  "version": "0.7.21",
+  "version": "0.8.1",
   "license": "MIT",
   "type": "module",
   "bin": {
@@ -22,8 +22,8 @@
     "react": "^18.2.0",
     "rxjs": "^7.8.1",
     "winston": "^3.13.0",
-    "@altronix/zdk": "0.7.3",
-    "@altronix/device": "0.7.2"
+    "@altronix/device": "0.7.2",
+    "@altronix/zdk": "0.7.3"
   },
   "devDependencies": {
     "@sindresorhus/tsconfig": "^3.0.1",