@lesscap/baton-cli 0.1.1 → 0.1.2

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 (2) hide show
  1. package/dist/baton.mjs +19 -3
  2. package/package.json +1 -1
package/dist/baton.mjs CHANGED
@@ -498,6 +498,11 @@ var primed = false;
498
498
  var primeLogin = (baseUrl) => {
499
499
  if (primed) return;
500
500
  primed = true;
501
+ const token = process.env.BATON_TOKEN;
502
+ if (token) {
503
+ setAuthHeaders({ authorization: `Bearer ${token}` });
504
+ return;
505
+ }
501
506
  const username = process.env.BATON_USER;
502
507
  const password = process.env.BATON_PASS;
503
508
  if (!username || !password) return;
@@ -508,7 +513,7 @@ var primeLogin = (baseUrl) => {
508
513
  headers: { "content-type": "application/json" },
509
514
  body: JSON.stringify({ username, password })
510
515
  });
511
- const cookie = (res.headers.get("set-cookie") ?? "").split(";")[0];
516
+ const cookie = (res.headers.getSetCookie()[0] ?? "").split(";")[0];
512
517
  if (res.ok && cookie) setAuthHeaders({ cookie });
513
518
  })().catch(() => {
514
519
  })
@@ -735,6 +740,12 @@ var resolveBaseUrl = (urlArg, env = process.env) => {
735
740
  if (cfg?.server) return cfg.server;
736
741
  return env.BATON_URL ?? "http://localhost:3280";
737
742
  };
743
+ var resolveBaseUrlOrNull = (urlArg, env = process.env) => {
744
+ if (urlArg) return urlArg;
745
+ const cfg = loadProjectConfigOrNull(projectConfigPath());
746
+ if (cfg?.server) return cfg.server;
747
+ return env.BATON_URL ?? null;
748
+ };
738
749
 
739
750
  // src/util.ts
740
751
  var common = {
@@ -2577,8 +2588,13 @@ var worker = defineCommand({
2577
2588
  ...common
2578
2589
  },
2579
2590
  run: async ({ args }) => {
2580
- const server = resolveBaseUrl(args.url);
2581
- const c = clientFor(args);
2591
+ const server = resolveBaseUrlOrNull(args.url);
2592
+ if (!server)
2593
+ throw new Error(
2594
+ "no baton server \u2014 pass --url <url> (e.g. https://baton.fmap.dev/api), set BATON_URL, or run `baton init`"
2595
+ );
2596
+ if (!args.json) console.log(`registering against ${server}`);
2597
+ const c = createClient(server);
2582
2598
  const hostname = osHostname();
2583
2599
  const machineId = readOrCreateMachineId();
2584
2600
  const name = args.name ?? hostname;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@lesscap/baton-cli",
3
- "version": "0.1.1",
3
+ "version": "0.1.2",
4
4
  "type": "module",
5
5
  "description": "baton CLI — register/run a worker, manage projects/requirements/tasks/sessions",
6
6
  "bin": {