@fnndsc/brasa 0.1.0 → 0.3.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (96) hide show
  1. package/dist/builtins/fs/cat.js +3 -63
  2. package/dist/builtins/fs/cat.js.map +1 -1
  3. package/dist/builtins/fs/download.d.ts +3 -1
  4. package/dist/builtins/fs/download.js +10 -7
  5. package/dist/builtins/fs/download.js.map +1 -1
  6. package/dist/builtins/fs/du.d.ts +2 -1
  7. package/dist/builtins/fs/du.js +15 -7
  8. package/dist/builtins/fs/du.js.map +1 -1
  9. package/dist/builtins/fs/edit.d.ts +3 -1
  10. package/dist/builtins/fs/edit.js +17 -23
  11. package/dist/builtins/fs/edit.js.map +1 -1
  12. package/dist/builtins/fs/ls.d.ts +2 -1
  13. package/dist/builtins/fs/ls.js +22 -11
  14. package/dist/builtins/fs/ls.js.map +1 -1
  15. package/dist/builtins/fs/pull.d.ts +2 -1
  16. package/dist/builtins/fs/pull.js +31 -27
  17. package/dist/builtins/fs/pull.js.map +1 -1
  18. package/dist/builtins/fs/tree.d.ts +2 -1
  19. package/dist/builtins/fs/tree.js +10 -13
  20. package/dist/builtins/fs/tree.js.map +1 -1
  21. package/dist/builtins/fs/upload.d.ts +3 -1
  22. package/dist/builtins/fs/upload.js +10 -8
  23. package/dist/builtins/fs/upload.js.map +1 -1
  24. package/dist/builtins/help.d.ts +16 -1
  25. package/dist/builtins/help.js +39 -18
  26. package/dist/builtins/help.js.map +1 -1
  27. package/dist/builtins/net/connect.d.ts +3 -2
  28. package/dist/builtins/net/connect.js +6 -8
  29. package/dist/builtins/net/connect.js.map +1 -1
  30. package/dist/builtins/net/cubepath.d.ts +2 -1
  31. package/dist/builtins/net/cubepath.js +19 -15
  32. package/dist/builtins/net/cubepath.js.map +1 -1
  33. package/dist/builtins/net/logout.d.ts +4 -2
  34. package/dist/builtins/net/logout.js +7 -4
  35. package/dist/builtins/net/logout.js.map +1 -1
  36. package/dist/builtins/net/pacs.d.ts +4 -1
  37. package/dist/builtins/net/pacs.js +38 -39
  38. package/dist/builtins/net/pacs.js.map +1 -1
  39. package/dist/builtins/net/query.d.ts +2 -2
  40. package/dist/builtins/net/query.js +20 -23
  41. package/dist/builtins/net/query.js.map +1 -1
  42. package/dist/builtins/parametersofplugin.d.ts +3 -2
  43. package/dist/builtins/parametersofplugin.js +8 -9
  44. package/dist/builtins/parametersofplugin.js.map +1 -1
  45. package/dist/builtins/proc.d.ts +3 -1
  46. package/dist/builtins/proc.js +74 -64
  47. package/dist/builtins/proc.js.map +1 -1
  48. package/dist/builtins/res/compute.d.ts +3 -1
  49. package/dist/builtins/res/compute.js +9 -12
  50. package/dist/builtins/res/compute.js.map +1 -1
  51. package/dist/builtins/res/feed.d.ts +3 -1
  52. package/dist/builtins/res/feed.js +58 -83
  53. package/dist/builtins/res/feed.js.map +1 -1
  54. package/dist/builtins/res/files.d.ts +7 -3
  55. package/dist/builtins/res/files.js +26 -25
  56. package/dist/builtins/res/files.js.map +1 -1
  57. package/dist/builtins/res/group.d.ts +3 -1
  58. package/dist/builtins/res/group.js +10 -14
  59. package/dist/builtins/res/group.js.map +1 -1
  60. package/dist/builtins/res/pipeline.d.ts +2 -1
  61. package/dist/builtins/res/pipeline.js +53 -53
  62. package/dist/builtins/res/pipeline.js.map +1 -1
  63. package/dist/builtins/res/plugin.d.ts +6 -2
  64. package/dist/builtins/res/plugin.js +47 -50
  65. package/dist/builtins/res/plugin.js.map +1 -1
  66. package/dist/builtins/res/plugininstance.d.ts +2 -1
  67. package/dist/builtins/res/plugininstance.js +9 -14
  68. package/dist/builtins/res/plugininstance.js.map +1 -1
  69. package/dist/builtins/res/pluginmeta.d.ts +2 -1
  70. package/dist/builtins/res/pluginmeta.js +9 -14
  71. package/dist/builtins/res/pluginmeta.js.map +1 -1
  72. package/dist/builtins/res/tag.d.ts +3 -1
  73. package/dist/builtins/res/tag.js +10 -14
  74. package/dist/builtins/res/tag.js.map +1 -1
  75. package/dist/builtins/res/workflow.d.ts +2 -1
  76. package/dist/builtins/res/workflow.js +9 -14
  77. package/dist/builtins/res/workflow.js.map +1 -1
  78. package/dist/builtins/store.d.ts +3 -1
  79. package/dist/builtins/store.js +19 -35
  80. package/dist/builtins/store.js.map +1 -1
  81. package/dist/builtins/sys/context.d.ts +2 -1
  82. package/dist/builtins/sys/context.js +5 -4
  83. package/dist/builtins/sys/context.js.map +1 -1
  84. package/dist/core/chiliDelegate.d.ts +10 -7
  85. package/dist/core/chiliDelegate.js +20 -11
  86. package/dist/core/chiliDelegate.js.map +1 -1
  87. package/dist/core/dispatch.d.ts +6 -0
  88. package/dist/core/dispatch.js +121 -169
  89. package/dist/core/dispatch.js.map +1 -1
  90. package/dist/core/sink.d.ts +57 -18
  91. package/dist/core/sink.js +77 -77
  92. package/dist/core/sink.js.map +1 -1
  93. package/dist/lib/vfs/vfs.d.ts +2 -2
  94. package/dist/lib/vfs/vfs.js +10 -14
  95. package/dist/lib/vfs/vfs.js.map +1 -1
  96. package/package.json +2 -2
@@ -1,7 +1,8 @@
1
+ import { type CommandEnvelope } from '@fnndsc/cumin';
1
2
  /**
2
3
  * Connects to a ChRIS CUBE instance using provided credentials.
3
4
  *
4
5
  * @param args - An array of arguments containing user, password, and URL.
5
- * @returns A Promise that resolves when the connection attempt is complete.
6
+ * @returns An envelope carrying the login result.
6
7
  */
7
- export declare function builtin_connect(args: string[]): Promise<void>;
8
+ export declare function builtin_connect(args: string[]): Promise<CommandEnvelope>;
@@ -7,12 +7,12 @@ import { commandArgs_process } from '../utils.js';
7
7
  import { connect_login } from '@fnndsc/chili/commands/connect/login.js';
8
8
  import { login_render } from '@fnndsc/chili/views/connect.js';
9
9
  import { session } from '../../session/index.js';
10
- import { chrisContext } from '@fnndsc/cumin';
10
+ import { chrisContext, envelope_ok, envelope_error } from '@fnndsc/cumin';
11
11
  /**
12
12
  * Connects to a ChRIS CUBE instance using provided credentials.
13
13
  *
14
14
  * @param args - An array of arguments containing user, password, and URL.
15
- * @returns A Promise that resolves when the connection attempt is complete.
15
+ * @returns An envelope carrying the login result.
16
16
  */
17
17
  export async function builtin_connect(args) {
18
18
  const parsed = commandArgs_process(args);
@@ -27,16 +27,14 @@ export async function builtin_connect(args) {
27
27
  // Refresh context to update prompt with new user/url
28
28
  await chrisContext.currentContext_update();
29
29
  }
30
- console.log(login_render(success, url, user));
30
+ return envelope_ok(`${login_render(success, url, user)}\n`);
31
31
  }
32
32
  catch (error) {
33
33
  const msg = error instanceof Error ? error.message : String(error);
34
- console.log(login_render(false, url, user));
35
- console.error(chalk.red(`Connection failed: ${msg}`));
34
+ process.exitCode = 1;
35
+ return envelope_error(`${login_render(false, url, user)}\n`, undefined, `${chalk.red(`Connection failed: ${msg}`)}\n`);
36
36
  }
37
37
  }
38
- else {
39
- console.log(chalk.red('Usage: connect --user <username> --password <password> <url>'));
40
- }
38
+ return envelope_ok(`${chalk.red('Usage: connect --user <username> --password <password> <url>')}\n`);
41
39
  }
42
40
  //# sourceMappingURL=connect.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"connect.js","sourceRoot":"","sources":["../../../src/builtins/net/connect.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,mBAAmB,EAAc,MAAM,aAAa,CAAC;AAC9D,OAAO,EAAE,aAAa,EAAE,MAAM,yCAAyC,CAAC;AACxE,OAAO,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAC9D,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACjD,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAE7C;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,eAAe,CAAC,IAAc;IAClD,MAAM,MAAM,GAAe,mBAAmB,CAAC,IAAI,CAAC,CAAC;IACrD,MAAM,IAAI,GAAW,MAAM,CAAC,IAAc,CAAC;IAC3C,MAAM,QAAQ,GAAW,MAAM,CAAC,QAAkB,CAAC;IACnD,MAAM,GAAG,GAAW,MAAM,CAAC,CAAC,CAAC,CAAC,CAAW,CAAC;IAE1C,IAAI,IAAI,IAAI,QAAQ,IAAI,GAAG,EAAE,CAAC;QAC5B,IAAI,CAAC;YACH,MAAM,OAAO,GAAY,MAAM,aAAa,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC;YACpF,IAAI,OAAO,EAAE,CAAC;gBACZ,OAAO,CAAC,OAAO,GAAG,KAAK,CAAC;gBACxB,qDAAqD;gBACrD,MAAM,YAAY,CAAC,qBAAqB,EAAE,CAAC;YAC7C,CAAC;YACD,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,OAAO,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC,CAAC;QAChD,CAAC;QAAC,OAAO,KAAc,EAAE,CAAC;YACxB,MAAM,GAAG,GAAW,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YAC3E,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,KAAK,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC,CAAC;YAC5C,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,sBAAsB,GAAG,EAAE,CAAC,CAAC,CAAC;QACxD,CAAC;IACH,CAAC;SAAM,CAAC;QACN,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,8DAA8D,CAAC,CAAC,CAAC;IACzF,CAAC;AACH,CAAC"}
1
+ {"version":3,"file":"connect.js","sourceRoot":"","sources":["../../../src/builtins/net/connect.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,mBAAmB,EAAc,MAAM,aAAa,CAAC;AAC9D,OAAO,EAAE,aAAa,EAAE,MAAM,yCAAyC,CAAC;AACxE,OAAO,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAC9D,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACjD,OAAO,EAAE,YAAY,EAAwB,WAAW,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAEhG;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,eAAe,CAAC,IAAc;IAClD,MAAM,MAAM,GAAe,mBAAmB,CAAC,IAAI,CAAC,CAAC;IACrD,MAAM,IAAI,GAAW,MAAM,CAAC,IAAc,CAAC;IAC3C,MAAM,QAAQ,GAAW,MAAM,CAAC,QAAkB,CAAC;IACnD,MAAM,GAAG,GAAW,MAAM,CAAC,CAAC,CAAC,CAAC,CAAW,CAAC;IAE1C,IAAI,IAAI,IAAI,QAAQ,IAAI,GAAG,EAAE,CAAC;QAC5B,IAAI,CAAC;YACH,MAAM,OAAO,GAAY,MAAM,aAAa,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC;YACpF,IAAI,OAAO,EAAE,CAAC;gBACZ,OAAO,CAAC,OAAO,GAAG,KAAK,CAAC;gBACxB,qDAAqD;gBACrD,MAAM,YAAY,CAAC,qBAAqB,EAAE,CAAC;YAC7C,CAAC;YACD,OAAO,WAAW,CAAC,GAAG,YAAY,CAAC,OAAO,EAAE,GAAG,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;QAC9D,CAAC;QAAC,OAAO,KAAc,EAAE,CAAC;YACxB,MAAM,GAAG,GAAW,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YAC3E,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;YACrB,OAAO,cAAc,CAAC,GAAG,YAAY,CAAC,KAAK,EAAE,GAAG,EAAE,IAAI,CAAC,IAAI,EAAE,SAAS,EAAE,GAAG,KAAK,CAAC,GAAG,CAAC,sBAAsB,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC;QACzH,CAAC;IACH,CAAC;IACD,OAAO,WAAW,CAAC,GAAG,KAAK,CAAC,GAAG,CAAC,8DAA8D,CAAC,IAAI,CAAC,CAAC;AACvG,CAAC"}
@@ -7,6 +7,7 @@
7
7
  *
8
8
  * @module
9
9
  */
10
+ import { CommandEnvelope } from '@fnndsc/cumin';
10
11
  /**
11
12
  * Resolves CUBE FS paths and file counts for all series under one or more PACS VFS paths.
12
13
  *
@@ -15,4 +16,4 @@
15
16
  * cubepath /net/pacs/queries/AccessionNumber:12345678_qid:2661
16
17
  * cubepath /net/pacs/queries/.../Series_1.2.3_AX_T2 /net/pacs/queries/.../Series_1.2.3_DWI
17
18
  */
18
- export declare function builtin_cubepath(args: string[]): Promise<void>;
19
+ export declare function builtin_cubepath(args: string[]): Promise<CommandEnvelope>;
@@ -8,8 +8,9 @@
8
8
  * @module
9
9
  */
10
10
  import chalk from 'chalk';
11
+ import { envelope_ok, envelope_error } from '@fnndsc/cumin';
11
12
  import { session } from '../../session/index.js';
12
- import { args_checkHasHelpFlag, help_show } from '../help.js';
13
+ import { args_checkHasHelpFlag, help_render } from '../help.js';
13
14
  import { path_resolve } from '../utils.js';
14
15
  import { pacs_seriesCollect, pacsServer_resolve, series_cubePathGet, } from './pacsUtils.js';
15
16
  /**
@@ -22,8 +23,7 @@ import { pacs_seriesCollect, pacsServer_resolve, series_cubePathGet, } from './p
22
23
  */
23
24
  export async function builtin_cubepath(args) {
24
25
  if (args_checkHasHelpFlag(args, 'cubepath')) {
25
- help_show('cubepath');
26
- return;
26
+ return envelope_ok(help_render('cubepath'));
27
27
  }
28
28
  let pacsserverOverride = null;
29
29
  let retry = false;
@@ -40,37 +40,35 @@ export async function builtin_cubepath(args) {
40
40
  }
41
41
  }
42
42
  if (positional.length === 0) {
43
- console.error(chalk.red('cubepath: Missing path. Usage: cubepath <vfs-path> [...]'));
44
43
  process.exitCode = 1;
45
- return;
44
+ return envelope_error('', undefined, `${chalk.red('cubepath: Missing path. Usage: cubepath <vfs-path> [...]')}\n`);
46
45
  }
47
46
  const pacsIdentifier = await pacsServer_resolve(pacsserverOverride);
48
47
  if (!pacsIdentifier) {
49
- console.error(chalk.red('cubepath: No PACS server available. Set one with: pacs connect <id>'));
50
48
  process.exitCode = 1;
51
- return;
49
+ return envelope_error('', undefined, `${chalk.red('cubepath: No PACS server available. Set one with: pacs connect <id>')}\n`);
52
50
  }
51
+ // Warnings accumulate on the err channel; result lines on the data channel.
52
+ let errOut = '';
53
53
  // Collect series from all paths
54
54
  const allSeries = [];
55
55
  for (const rawPath of positional) {
56
56
  const vfsPath = rawPath.startsWith('/') ? rawPath : await path_resolve(rawPath);
57
57
  if (!vfsPath.startsWith('/net/pacs')) {
58
- console.error(chalk.red(`cubepath: Not a PACS VFS path: ${rawPath}`));
58
+ errOut += `${chalk.red(`cubepath: Not a PACS VFS path: ${rawPath}`)}\n`;
59
59
  continue;
60
60
  }
61
61
  const found = await pacs_seriesCollect(vfsPath, pacsIdentifier, 'cubepath');
62
62
  allSeries.push(...found);
63
63
  }
64
64
  if (allSeries.length === 0) {
65
- console.error(chalk.yellow('cubepath: No series found under that path.'));
66
65
  process.exitCode = 1;
67
- return;
66
+ return envelope_error('', undefined, `${errOut}${chalk.yellow('cubepath: No series found under that path.')}\n`);
68
67
  }
69
68
  const client = await session.connection.client_get();
70
69
  if (!client) {
71
- console.error(chalk.red('cubepath: Not connected to ChRIS.'));
72
70
  process.exitCode = 1;
73
- return;
71
+ return envelope_error('', undefined, `${errOut}${chalk.red('cubepath: Not connected to ChRIS.')}\n`);
74
72
  }
75
73
  const pacsClient = client;
76
74
  const maxAttempts = retry ? 4 : 1;
@@ -80,6 +78,7 @@ export async function builtin_cubepath(args) {
80
78
  return { info, cubePath };
81
79
  }));
82
80
  const maxLabelLen = Math.max(...results.map((r) => r.info.seriesLabel.length));
81
+ let rendered = '';
83
82
  let notInCube = 0;
84
83
  for (const { info, cubePath } of results) {
85
84
  const label = info.seriesLabel.padEnd(maxLabelLen);
@@ -88,15 +87,20 @@ export async function builtin_cubepath(args) {
88
87
  const countStr = cubePath.fileCount > 0
89
88
  ? chalk.green(`(${cubePath.fileCount} files)`)
90
89
  : chalk.yellow('(0 files — may not be pulled)');
91
- console.log(` ${chalk.white(label)} ${arrow} ${chalk.cyan(cubePath.folderPath)} ${countStr}`);
90
+ rendered += ` ${chalk.white(label)} ${arrow} ${chalk.cyan(cubePath.folderPath)} ${countStr}\n`;
92
91
  }
93
92
  else {
94
- console.log(` ${chalk.white(label)} ${arrow} ${chalk.gray('(not in CUBE)')}`);
93
+ rendered += ` ${chalk.white(label)} ${arrow} ${chalk.gray('(not in CUBE)')}\n`;
95
94
  notInCube++;
96
95
  }
97
96
  }
98
97
  if (notInCube > 0) {
99
- console.log(chalk.gray(`\n ${notInCube}/${results.length} series not found in CUBE — use pull to retrieve.`));
98
+ rendered += `${chalk.gray(`\n ${notInCube}/${results.length} series not found in CUBE — use pull to retrieve.`)}\n`;
100
99
  }
100
+ const envelope = envelope_ok(rendered);
101
+ if (errOut.length > 0) {
102
+ envelope.renderedErr = errOut;
103
+ }
104
+ return envelope;
101
105
  }
102
106
  //# sourceMappingURL=cubepath.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"cubepath.js","sourceRoot":"","sources":["../../../src/builtins/net/cubepath.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"cubepath.js","sourceRoot":"","sources":["../../../src/builtins/net/cubepath.ts"],"names":[],"mappings":"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"}
@@ -1,6 +1,8 @@
1
+ import { CommandEnvelope } from '@fnndsc/cumin';
1
2
  /**
2
3
  * Logs out from the current ChRIS CUBE session.
3
4
  *
4
- * @returns A Promise that resolves when the logout operation is complete.
5
+ * @returns An envelope carrying the logout notice; on failure the data channel
6
+ * still reports the logout and the error channel carries the reason.
5
7
  */
6
- export declare function builtin_logout(): Promise<void>;
8
+ export declare function builtin_logout(): Promise<CommandEnvelope>;
@@ -3,22 +3,25 @@
3
3
  * Disconnects from ChRIS.
4
4
  */
5
5
  import chalk from 'chalk';
6
+ import { envelope_ok } from '@fnndsc/cumin';
6
7
  import { connect_logout } from '@fnndsc/chili/commands/connect/logout.js';
7
8
  import { logout_render } from '@fnndsc/chili/views/connect.js';
8
9
  /**
9
10
  * Logs out from the current ChRIS CUBE session.
10
11
  *
11
- * @returns A Promise that resolves when the logout operation is complete.
12
+ * @returns An envelope carrying the logout notice; on failure the data channel
13
+ * still reports the logout and the error channel carries the reason.
12
14
  */
13
15
  export async function builtin_logout() {
14
16
  try {
15
17
  await connect_logout();
16
- console.log(logout_render(true));
18
+ return envelope_ok(`${logout_render(true)}\n`);
17
19
  }
18
20
  catch (error) {
19
- console.log(logout_render(false));
20
21
  const msg = error instanceof Error ? error.message : String(error);
21
- console.error(chalk.red(`Logout failed: ${msg}`));
22
+ const envelope = envelope_ok(`${logout_render(false)}\n`);
23
+ envelope.renderedErr = `${chalk.red(`Logout failed: ${msg}`)}\n`;
24
+ return envelope;
22
25
  }
23
26
  }
24
27
  //# sourceMappingURL=logout.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"logout.js","sourceRoot":"","sources":["../../../src/builtins/net/logout.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,cAAc,EAAE,MAAM,0CAA0C,CAAC;AAC1E,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAE/D;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,cAAc;IAClC,IAAI,CAAC;QACH,MAAM,cAAc,EAAE,CAAC;QACvB,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC;IACnC,CAAC;IAAC,OAAO,KAAc,EAAE,CAAC;QACxB,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC;QAClC,MAAM,GAAG,GAAW,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAC3E,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,kBAAkB,GAAG,EAAE,CAAC,CAAC,CAAC;IACpD,CAAC;AACH,CAAC"}
1
+ {"version":3,"file":"logout.js","sourceRoot":"","sources":["../../../src/builtins/net/logout.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAmB,WAAW,EAAE,MAAM,eAAe,CAAC;AAC7D,OAAO,EAAE,cAAc,EAAE,MAAM,0CAA0C,CAAC;AAC1E,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAE/D;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,cAAc;IAClC,IAAI,CAAC;QACH,MAAM,cAAc,EAAE,CAAC;QACvB,OAAO,WAAW,CAAC,GAAG,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACjD,CAAC;IAAC,OAAO,KAAc,EAAE,CAAC;QACxB,MAAM,GAAG,GAAW,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAC3E,MAAM,QAAQ,GAAoB,WAAW,CAAC,GAAG,aAAa,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAC3E,QAAQ,CAAC,WAAW,GAAG,GAAG,KAAK,CAAC,GAAG,CAAC,kBAAkB,GAAG,EAAE,CAAC,IAAI,CAAC;QACjE,OAAO,QAAQ,CAAC;IAClB,CAAC;AACH,CAAC"}
@@ -7,6 +7,7 @@
7
7
  *
8
8
  * @module
9
9
  */
10
+ import { type CommandEnvelope } from '@fnndsc/cumin';
10
11
  /**
11
12
  * PACS subsystem command — server context management, query, and pull.
12
13
  *
@@ -20,5 +21,7 @@
20
21
  * pacs pull <vfs-path...> — pull DICOM series into ChRIS storage
21
22
  *
22
23
  * @param args - Command arguments (subcommand + its own args).
24
+ * @returns An envelope; streaming subcommands carry empty rendered text and
25
+ * emit their output live, while query/pull return their own envelopes.
23
26
  */
24
- export declare function builtin_pacs(args: string[]): Promise<void>;
27
+ export declare function builtin_pacs(args: string[]): Promise<CommandEnvelope>;
@@ -8,33 +8,34 @@
8
8
  * @module
9
9
  */
10
10
  import chalk from 'chalk';
11
- import { chrisContext, pacsServers_list } from '@fnndsc/cumin';
11
+ import { chrisContext, pacsServers_list, envelope_ok, envelope_error } from '@fnndsc/cumin';
12
12
  import { builtin_query } from './query.js';
13
13
  import { builtin_pull } from '../fs/pull.js';
14
- import { args_checkHasHelpFlag, help_show } from '../help.js';
14
+ import { args_checkHasHelpFlag, help_render } from '../help.js';
15
+ import { sink_dataLine, sink_errLine } from '../../core/sink.js';
15
16
  /**
16
- * Prints the list of registered PACS servers, marking the active one.
17
+ * Streams the list of registered PACS servers, marking the active one.
17
18
  *
18
19
  * @param active - Current active PACS server identifier or null.
19
20
  */
20
21
  async function servers_print(active) {
21
22
  const result = await pacsServers_list();
22
23
  if (!result.ok || result.value.length === 0) {
23
- console.log(chalk.yellow('No PACS servers registered in CUBE.'));
24
+ sink_dataLine(chalk.yellow('No PACS servers registered in CUBE.'));
24
25
  return;
25
26
  }
26
- console.log('');
27
+ sink_dataLine('');
27
28
  for (const srv of result.value) {
28
29
  const label = srv.identifier ?? srv.name ?? String(srv.id);
29
30
  const isActive = active !== null &&
30
31
  (label === active || String(srv.id) === active);
31
32
  const marker = isActive ? chalk.green(' ✓ active') : '';
32
33
  const idStr = chalk.gray(`[${srv.id}]`);
33
- console.log(` ${idStr} ${chalk.cyan(label.padEnd(20))}${marker}`);
34
+ sink_dataLine(` ${idStr} ${chalk.cyan(label.padEnd(20))}${marker}`);
34
35
  }
35
- console.log('');
36
- console.log(chalk.gray(' Use: pacs connect <name|id>'));
37
- console.log('');
36
+ sink_dataLine('');
37
+ sink_dataLine(chalk.gray(' Use: pacs connect <name|id>'));
38
+ sink_dataLine('');
38
39
  }
39
40
  /**
40
41
  * PACS subsystem command — server context management, query, and pull.
@@ -49,27 +50,28 @@ async function servers_print(active) {
49
50
  * pacs pull <vfs-path...> — pull DICOM series into ChRIS storage
50
51
  *
51
52
  * @param args - Command arguments (subcommand + its own args).
53
+ * @returns An envelope; streaming subcommands carry empty rendered text and
54
+ * emit their output live, while query/pull return their own envelopes.
52
55
  */
53
56
  export async function builtin_pacs(args) {
54
57
  if (args_checkHasHelpFlag(args, 'pacs')) {
55
- help_show('pacs');
56
- return;
58
+ return envelope_ok(help_render('pacs'));
57
59
  }
58
60
  const subcommand = args[0];
59
61
  // No subcommand — show active server
60
62
  if (!subcommand) {
61
63
  const active = await chrisContext.PACSserver_get();
62
64
  if (active) {
63
- console.log(`Active PACS server: ${chalk.cyan(active)}`);
64
- console.log(chalk.gray(' pacs connect — list all servers'));
65
- console.log(chalk.gray(' pacs disconnect — clear active server'));
65
+ sink_dataLine(`Active PACS server: ${chalk.cyan(active)}`);
66
+ sink_dataLine(chalk.gray(' pacs connect — list all servers'));
67
+ sink_dataLine(chalk.gray(' pacs disconnect — clear active server'));
66
68
  }
67
69
  else {
68
- console.log(chalk.yellow('No PACS server set.'));
69
- console.log(chalk.gray(' pacs connect — list available servers'));
70
- console.log(chalk.gray(' pacs connect <id> — set active server'));
70
+ sink_dataLine(chalk.yellow('No PACS server set.'));
71
+ sink_dataLine(chalk.gray(' pacs connect — list available servers'));
72
+ sink_dataLine(chalk.gray(' pacs connect <id> — set active server'));
71
73
  }
72
- return;
74
+ return envelope_ok('');
73
75
  }
74
76
  switch (subcommand) {
75
77
  case 'connect': {
@@ -77,45 +79,42 @@ export async function builtin_pacs(args) {
77
79
  if (!target) {
78
80
  const active = await chrisContext.PACSserver_get();
79
81
  await servers_print(active);
80
- return;
82
+ return envelope_ok('');
81
83
  }
82
84
  const ok = await chrisContext.PACSserver_set(target);
83
85
  if (ok) {
84
- console.log(chalk.green(`[+] PACS server set to '${target}'`));
85
- }
86
- else {
87
- console.error(chalk.red(`pacs connect: Failed to set server '${target}'`));
88
- process.exitCode = 1;
86
+ sink_dataLine(chalk.green(`[+] PACS server set to '${target}'`));
87
+ return envelope_ok('');
89
88
  }
90
- return;
89
+ sink_errLine(chalk.red(`pacs connect: Failed to set server '${target}'`));
90
+ process.exitCode = 1;
91
+ return envelope_error('');
91
92
  }
92
93
  case 'disconnect': {
93
94
  const ok = await chrisContext.PACSserver_set('');
94
95
  if (ok) {
95
- console.log(chalk.green('[-] PACS server context cleared.'));
96
- }
97
- else {
98
- console.error(chalk.red('pacs disconnect: Failed to clear PACS server context.'));
99
- process.exitCode = 1;
96
+ sink_dataLine(chalk.green('[-] PACS server context cleared.'));
97
+ return envelope_ok('');
100
98
  }
101
- return;
99
+ sink_errLine(chalk.red('pacs disconnect: Failed to clear PACS server context.'));
100
+ process.exitCode = 1;
101
+ return envelope_error('');
102
102
  }
103
103
  case 'list': {
104
104
  const active = await chrisContext.PACSserver_get();
105
105
  await servers_print(active);
106
- return;
106
+ return envelope_ok('');
107
107
  }
108
108
  case 'query':
109
- await builtin_query(args.slice(1));
110
- return;
109
+ return builtin_query(args.slice(1));
111
110
  case 'pull':
112
- await builtin_pull(args.slice(1));
113
- return;
111
+ return builtin_pull(args.slice(1));
114
112
  default:
115
- console.error(chalk.red(`pacs: Unknown subcommand '${subcommand}'`));
116
- console.log(chalk.gray(' Subcommands: connect, disconnect, list, query, pull'));
117
- console.log(chalk.gray(' Try: help pacs'));
113
+ sink_errLine(chalk.red(`pacs: Unknown subcommand '${subcommand}'`));
114
+ sink_dataLine(chalk.gray(' Subcommands: connect, disconnect, list, query, pull'));
115
+ sink_dataLine(chalk.gray(' Try: help pacs'));
118
116
  process.exitCode = 1;
117
+ return envelope_error('');
119
118
  }
120
119
  }
121
120
  //# sourceMappingURL=pacs.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"pacs.js","sourceRoot":"","sources":["../../../src/builtins/net/pacs.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"pacs.js","sourceRoot":"","sources":["../../../src/builtins/net/pacs.ts"],"names":[],"mappings":"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"}
@@ -8,7 +8,7 @@
8
8
  *
9
9
  * @module
10
10
  */
11
- import { PACSQueryDecodedResult } from '@fnndsc/cumin';
11
+ import { PACSQueryDecodedResult, type CommandEnvelope } from '@fnndsc/cumin';
12
12
  /**
13
13
  * Result of a successful query-create-and-wait operation.
14
14
  *
@@ -57,4 +57,4 @@ export declare function pacsQuery_createAndWait(queryExpr: string, title: string
57
57
  * query 'PatientID:1234,StudyDate:20240101' --title 'Hip DDH Jan 2024'
58
58
  * query AccessionNumber:12345678 --table
59
59
  */
60
- export declare function builtin_query(args: string[]): Promise<void>;
60
+ export declare function builtin_query(args: string[]): Promise<CommandEnvelope>;
@@ -9,10 +9,10 @@
9
9
  * @module
10
10
  */
11
11
  import chalk from 'chalk';
12
- import { errorStack, chrisContext, Context, pacsQuery_get, pacsQuery_resultDecode, pacsQueries_create, pacsServers_list, } from '@fnndsc/cumin';
12
+ import { errorStack, chrisContext, Context, pacsQuery_get, pacsQuery_resultDecode, pacsQueries_create, pacsServers_list, envelope_ok, envelope_error, } from '@fnndsc/cumin';
13
13
  import { screen } from '@fnndsc/chili/screen/screen.js';
14
14
  import { spinner } from '../../lib/spinner.js';
15
- import { args_checkHasHelpFlag, help_show } from '../help.js';
15
+ import { args_checkHasHelpFlag, help_render } from '../help.js';
16
16
  const QUERY_POLL_INTERVAL_MS = 2_000;
17
17
  const QUERY_TIMEOUT_MS = 60_000;
18
18
  /**
@@ -242,8 +242,7 @@ function queryResult_renderTable(decoded, title) {
242
242
  */
243
243
  export async function builtin_query(args) {
244
244
  if (args_checkHasHelpFlag(args, 'query')) {
245
- help_show('query');
246
- return;
245
+ return envelope_ok(help_render('query'));
247
246
  }
248
247
  let title = `Query ${Date.now()}`;
249
248
  let pacsserverOverride = null;
@@ -264,16 +263,14 @@ export async function builtin_query(args) {
264
263
  }
265
264
  }
266
265
  if (positional.length === 0) {
267
- console.error(chalk.red('query: Missing query expression. Usage: query <Key:Value[,...]> [--title <title>]'));
268
266
  process.exitCode = 1;
269
- return;
267
+ return envelope_error('', undefined, `${chalk.red('query: Missing query expression. Usage: query <Key:Value[,...]> [--title <title>]')}\n`);
270
268
  }
271
269
  const queryExpr = positional.join(' ');
272
270
  // Validate expression early
273
271
  if (!queryExpr_parse(queryExpr)) {
274
- console.error(chalk.red(`query: Invalid expression: "${queryExpr}". Use Key:Value pairs (e.g. PatientID:1234) or JSON.`));
275
272
  process.exitCode = 1;
276
- return;
273
+ return envelope_error('', undefined, `${chalk.red(`query: Invalid expression: "${queryExpr}". Use Key:Value pairs (e.g. PatientID:1234) or JSON.`)}\n`);
277
274
  }
278
275
  // Resolve PACS server
279
276
  let pacsserver = pacsserverOverride ?? await chrisContext.current_get(Context.PACSserver);
@@ -283,42 +280,42 @@ export async function builtin_query(args) {
283
280
  pacsserver = String(serversResult.value[0].id);
284
281
  }
285
282
  else {
286
- console.error(chalk.red('query: No PACS server available. Set one with: pacs connect <id>'));
287
283
  process.exitCode = 1;
288
- return;
284
+ return envelope_error('', undefined, `${chalk.red('query: No PACS server available. Set one with: pacs connect <id>')}\n`);
289
285
  }
290
286
  }
291
287
  spinner.start(`Querying PACS for ${queryExpr}...`, true);
292
288
  const result = await pacsQuery_createAndWait(queryExpr, title, pacsserver, (msg) => spinner.updateMessage(msg));
293
289
  spinner.stop();
294
290
  if (!result) {
291
+ let errOut = '';
295
292
  const errs = errorStack.stack_getAll?.() ?? [];
296
293
  if (errs.length) {
297
- // Print the stack directly: in -c/-f mode nothing else will.
294
+ // Carry the stack directly: in -c/-f mode nothing else will.
298
295
  errs.forEach((err) => {
299
296
  const msg = typeof err === 'string' ? err : (err.message ?? String(err));
300
- console.error(chalk.red(msg));
297
+ errOut += `${chalk.red(msg)}\n`;
301
298
  });
302
299
  }
303
300
  else {
304
- console.error(chalk.red('query: Failed — check connection and PACS server context.'));
301
+ errOut += `${chalk.red('query: Failed — check connection and PACS server context.')}\n`;
305
302
  }
306
303
  process.exitCode = 1;
307
- return;
304
+ return envelope_error('', undefined, errOut);
308
305
  }
309
- const rendered = tableMode
306
+ const renderedResult = tableMode
310
307
  ? queryResult_renderTable(result.decoded, title !== `Query ${Date.now()}` ? title : undefined)
311
308
  : queryResult_render(result.decoded);
312
- if (!rendered) {
309
+ if (!renderedResult) {
313
310
  // Nothing matched: browsing or pulling the empty query would be
314
311
  // meaningless, so no hints.
315
- console.log(chalk.yellow(`⚠ Query ${result.queryId} complete — no studies found.`));
316
- return;
312
+ return envelope_ok(`${chalk.yellow(`⚠ Query ${result.queryId} complete — no studies found.`)}\n`);
317
313
  }
318
- console.log(chalk.green(`✓ Query ${result.queryId} complete`));
319
- console.log(rendered);
320
- console.log(chalk.bold(` VFS path: ${chalk.cyan(result.vfsPath)}`));
321
- console.log(chalk.gray(` cd ${result.vfsPath}`));
322
- console.log(chalk.gray(` pull ${result.vfsPath}`));
314
+ let rendered = `${chalk.green(`✓ Query ${result.queryId} complete`)}\n`;
315
+ rendered += `${renderedResult}\n`;
316
+ rendered += `${chalk.bold(` VFS path: ${chalk.cyan(result.vfsPath)}`)}\n`;
317
+ rendered += `${chalk.gray(` cd ${result.vfsPath}`)}\n`;
318
+ rendered += `${chalk.gray(` pull ${result.vfsPath}`)}\n`;
319
+ return envelope_ok(rendered);
323
320
  }
324
321
  //# sourceMappingURL=query.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"query.js","sourceRoot":"","sources":["../../../src/builtins/net/query.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"query.js","sourceRoot":"","sources":["../../../src/builtins/net/query.ts"],"names":[],"mappings":"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"}
@@ -3,11 +3,12 @@
3
3
  *
4
4
  * @module
5
5
  */
6
+ import { type CommandEnvelope } from '@fnndsc/cumin';
6
7
  /**
7
8
  * Handles the 'parametersofplugin' builtin command.
8
9
  * This command displays information about plugin parameters.
9
10
  *
10
11
  * @param args - Arguments passed to the command.
11
- * @returns A Promise that resolves once the command has been processed.
12
+ * @returns An envelope carrying the rendered parameters or fields.
12
13
  */
13
- export declare function builtin_parametersofplugin(args: string[]): Promise<void>;
14
+ export declare function builtin_parametersofplugin(args: string[]): Promise<CommandEnvelope>;