three-blocks-login 0.0.4 → 0.1.1

package/bin/login.js

@@ -5,6 +5,10 @@
 import fs from "node:fs";
 import os from "node:os";
 import path from "node:path";
+import { createRequire } from "node:module";
+
+const require = createRequire(import.meta.url);
+const pkg = require("../package.json");
 
 // Simple ANSI color helpers (no deps)
 const ESC = (n) => `\u001b[${n}m`;
@@ -15,7 +19,7 @@ const red = (s) => ESC(31) + s + reset;
 const green = (s) => ESC(32) + s + reset;
 const yellow = (s) => ESC(33) + s + reset;
 const cyan = (s) => ESC(36) + s + reset;
-const plainBanner = "[three-blocks-login]";
+const plainBanner = `[three-blocks-login@${pkg.version}]`;
 const banner = bold(cyan(plainBanner));
 
 const args = parseArgs(process.argv.slice(2));
@@ -25,6 +29,8 @@ const SCOPE = (args.scope || "@three-blocks").replace(/^\s+|\s+$/g, "");
 const MODE = (args.mode || "env").toLowerCase(); // env | project | user
 const QUIET = !!args.quiet;
 const VERBOSE = !!args.verbose;
+let CHANNEL = String(args.channel || process.env.THREE_BLOCKS_CHANNEL || "stable").toLowerCase();
+if (!['stable','alpha','beta'].includes(CHANNEL)) CHANNEL = 'stable';
 
 // Load .env from current working directory (no deps)
 loadEnvFromDotfile(process.cwd());
@@ -35,7 +41,7 @@ const BROKER_URL =
   "http://localhost:3000/api/npm/token"; // your Astro broker endpoint
 
 const LICENSE =
-  args.license || process.env.THREE_BLOCKS_SECRET_KEY || process.env.THREE_BLOCKS_LICENSE_KEY;
+  args.license || process.env.THREE_BLOCKS_SECRET_KEY;
 
 if (!LICENSE || String(LICENSE).trim() === "") {
   fail(
@@ -71,7 +77,7 @@ const log = {
 
 (async () => {
   try {
-    const tokenData = await fetchToken(BROKER_URL, LICENSE_CLEAN);
+    const tokenData = await fetchToken(BROKER_URL, LICENSE_CLEAN, CHANNEL);
     const { registry, token, expiresAt } = tokenData;
 
     if (!registry || !token) fail("Broker response missing registry/token.");
@@ -98,6 +104,7 @@ const log = {
         `# scope: ${SCOPE} | registry: ${u.href} | expires: ${expiresAt ?? "unknown"}`,
         `export NPM_CONFIG_USERCONFIG="${tmpFile}"`,
         `export npm_config_userconfig="${tmpFile}"`,
+        `export THREE_BLOCKS_CHANNEL="${CHANNEL}"`,
         `echo "${plainBanner} ${SCOPE} -> ${u.href} (expires ${expiresAt ?? "unknown"})"`
       ];
       console.log(lines.join("\n"));
@@ -135,7 +142,7 @@ const log = {
     if (/ByteString/i.test(msg) || /character at index/i.test(msg)) {
       return fail("License appears malformed. Please copy your tb_… key exactly and retry.");
     }
-    return fail("Request failed. Please try again. Use --verbose for details.");
+    return fail("Authentication failed. Please try again. Use --verbose for details.");
   }
 })();
 
@@ -149,30 +156,39 @@ function ensureTrailingSlash(url) {
 
 function loadEnvFromDotfile(dir) {
   try {
-    const file = path.join(dir, ".env");
-    if (!fs.existsSync(file)) return;
-    const txt = fs.readFileSync(file, "utf8");
-    for (const raw of txt.split(/\r?\n/)) {
-      const line = raw.trim();
-      if (!line || line.startsWith("#")) continue;
-      const eq = line.indexOf("=");
-      if (eq === -1) continue;
-      const key = line.slice(0, eq).trim();
-      let val = line.slice(eq + 1).trim();
-      if ((val.startsWith('"') && val.endsWith('"')) || (val.startsWith("'") && val.endsWith("'"))) {
-        val = val.slice(1, -1);
+    const files = [path.join(dir, ".env.local"), path.join(dir, ".env")];
+    for (const file of files) {
+      if (!fs.existsSync(file)) continue;
+      const txt = fs.readFileSync(file, "utf8");
+      for (const raw of txt.split(/\r?\n/)) {
+        const line = raw.trim();
+        if (!line || line.startsWith("#")) continue;
+        const eq = line.indexOf("=");
+        if (eq === -1) continue;
+        const key = line.slice(0, eq).trim();
+        let val = line.slice(eq + 1).trim();
+        if ((val.startsWith('"') && val.endsWith('"')) || (val.startsWith("'") && val.endsWith("'"))) {
+          val = val.slice(1, -1);
+        }
+        if (process.env[key] === undefined) process.env[key] = val;
       }
-      if (process.env[key] === undefined) process.env[key] = val;
     }
   } catch {}
 }
 
-async function fetchToken(endpoint, license) {
-  const res = await fetch(endpoint, {
+async function fetchToken(endpoint, license, channel) {
+  let url = endpoint;
+  try {
+    const u = new URL(endpoint);
+    if (!u.searchParams.get('channel')) u.searchParams.set('channel', channel);
+    url = u.toString();
+  } catch {}
+  const res = await fetch(url, {
     method: "GET",
     headers: {
       "authorization": `Bearer ${license}`,
-      "accept": "application/json"
+      "accept": "application/json",
+      "x-three-blocks-channel": channel
     }
   });
   if (!res.ok) {

package/package.json

@@ -1,16 +1,24 @@
 {
   "name": "three-blocks-login",
-  "version": "0.0.4",
+  "version": "0.1.1",
   "description": "Fetch a short-lived token from the three-blocks broker and configure npm for the current context.",
   "type": "module",
   "bin": {
     "three-blocks-login": "bin/login.js"
   },
   "license": "MIT",
-  "files": ["bin/"],
-  "keywords": ["npm", "login", "three-blocks", "token", "ci"],
+  "files": [
+    "bin/"
+  ],
+  "keywords": [
+    "npm",
+    "login",
+    "three-blocks",
+    "token",
+    "ci"
+  ],
   "dependencies": {},
   "publishConfig": {
     "access": "public"
   }
-}
+}