@openwop/cli 1.4.0 → 1.4.1

package/dist/cli.js

@@ -578,7 +578,7 @@ function errText(err) {
 // package.json
 var package_default = {
   name: "@openwop/cli",
-  version: "1.4.0",
+  version: "1.4.1",
   description: "OpenWOP CLI for operating the workflow-engine demo app and OpenWOP-compatible hosts.",
   license: "Apache-2.0",
   type: "module",
@@ -4526,7 +4526,7 @@ async function runCatalogPacks(ctx, argv = []) {
     write(ctx.io.stdout, CATALOG_HELP);
     return 0;
   }
-  const res = await requestJson(ctx, "/v1/packs", { auth: false });
+  const res = await catalogRead(ctx, "", { auth: false });
   if (ctx.json) {
     writeJson(ctx.io.stdout, res.body);
     return 0;
@@ -4535,6 +4535,14 @@ async function runCatalogPacks(ctx, argv = []) {
   writeLine(ctx.io.stdout, formatTable(rows, ["name", "nodes"]));
   return 0;
 }
+async function catalogRead(ctx, rest, options = {}) {
+  try {
+    return await requestJson(ctx, `/v1/host/openwop-app/packs${rest}`, options);
+  } catch (err) {
+    if (err instanceof HttpError && err.status === 404) return requestJson(ctx, `/v1/packs${rest}`, options);
+    throw err;
+  }
+}
 async function runCatalogPacksVerb(ctx, verb, argv) {
   const { options, positionals } = parseOptions(argv, { bool: ["--help"], value: ["--out"] });
   if (options.help) {
@@ -4543,7 +4551,7 @@ async function runCatalogPacksVerb(ctx, verb, argv) {
   }
   if (verb === "search") {
     const q = positionals[0] ?? "";
-    const res2 = await requestJson(ctx, `/v1/packs/-/search${q ? `?q=${encodeURIComponent(q)}` : ""}`);
+    const res2 = await catalogRead(ctx, `/-/search${q ? `?q=${encodeURIComponent(q)}` : ""}`);
     if (ctx.json) {
       writeJson(ctx.io.stdout, res2.body);
       return 0;
@@ -4559,7 +4567,7 @@ async function runCatalogPacksVerb(ctx, verb, argv) {
   }
   if (verb === "get") {
     if (positionals.length !== 1) throw new CliError("Usage: openwop catalog packs get <packName> [--json]", 2);
-    const res2 = await requestJson(ctx, `/v1/packs/${encodeURIComponent(positionals[0])}`);
+    const res2 = await catalogRead(ctx, `/${encodeURIComponent(positionals[0])}`);
     if (ctx.json) {
       writeJson(ctx.io.stdout, res2.body);
       return 0;
@@ -4570,7 +4578,7 @@ async function runCatalogPacksVerb(ctx, verb, argv) {
     for (const n of nodes) writeLine(ctx.io.stdout, `  ${n}`);
     return 0;
   }
-  const res = await requestJson(ctx, "/v1/packs/export");
+  const res = await catalogRead(ctx, "/export");
   if (options.out) {
     writeFileSync4(String(options.out), `${JSON.stringify(res.body, null, 2)}
 `);

package/dist/openwop.js

@@ -579,7 +579,7 @@ function errText(err) {
 // package.json
 var package_default = {
   name: "@openwop/cli",
-  version: "1.4.0",
+  version: "1.4.1",
   description: "OpenWOP CLI for operating the workflow-engine demo app and OpenWOP-compatible hosts.",
   license: "Apache-2.0",
   type: "module",
@@ -4526,7 +4526,7 @@ async function runCatalogPacks(ctx, argv = []) {
     write(ctx.io.stdout, CATALOG_HELP);
     return 0;
   }
-  const res = await requestJson(ctx, "/v1/packs", { auth: false });
+  const res = await catalogRead(ctx, "", { auth: false });
   if (ctx.json) {
     writeJson(ctx.io.stdout, res.body);
     return 0;
@@ -4535,6 +4535,14 @@ async function runCatalogPacks(ctx, argv = []) {
   writeLine(ctx.io.stdout, formatTable(rows, ["name", "nodes"]));
   return 0;
 }
+async function catalogRead(ctx, rest, options = {}) {
+  try {
+    return await requestJson(ctx, `/v1/host/openwop-app/packs${rest}`, options);
+  } catch (err) {
+    if (err instanceof HttpError && err.status === 404) return requestJson(ctx, `/v1/packs${rest}`, options);
+    throw err;
+  }
+}
 async function runCatalogPacksVerb(ctx, verb, argv) {
   const { options, positionals } = parseOptions(argv, { bool: ["--help"], value: ["--out"] });
   if (options.help) {
@@ -4543,7 +4551,7 @@ async function runCatalogPacksVerb(ctx, verb, argv) {
   }
   if (verb === "search") {
     const q = positionals[0] ?? "";
-    const res2 = await requestJson(ctx, `/v1/packs/-/search${q ? `?q=${encodeURIComponent(q)}` : ""}`);
+    const res2 = await catalogRead(ctx, `/-/search${q ? `?q=${encodeURIComponent(q)}` : ""}`);
     if (ctx.json) {
       writeJson(ctx.io.stdout, res2.body);
       return 0;
@@ -4559,7 +4567,7 @@ async function runCatalogPacksVerb(ctx, verb, argv) {
   }
   if (verb === "get") {
     if (positionals.length !== 1) throw new CliError("Usage: openwop catalog packs get <packName> [--json]", 2);
-    const res2 = await requestJson(ctx, `/v1/packs/${encodeURIComponent(positionals[0])}`);
+    const res2 = await catalogRead(ctx, `/${encodeURIComponent(positionals[0])}`);
     if (ctx.json) {
       writeJson(ctx.io.stdout, res2.body);
       return 0;
@@ -4570,7 +4578,7 @@ async function runCatalogPacksVerb(ctx, verb, argv) {
     for (const n of nodes) writeLine(ctx.io.stdout, `  ${n}`);
     return 0;
   }
-  const res = await requestJson(ctx, "/v1/packs/export");
+  const res = await catalogRead(ctx, "/export");
   if (options.out) {
     writeFileSync4(String(options.out), `${JSON.stringify(res.body, null, 2)}
 `);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openwop/cli",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "description": "OpenWOP CLI for operating the workflow-engine demo app and OpenWOP-compatible hosts.",
   "license": "Apache-2.0",
   "type": "module",