@needle-tools/gltf-build-pipeline 3.0.0-next.3fbb1fc → 3.0.0-next.73f1606

package/dist/cli/index.js

@@ -1190,7 +1190,7 @@ function registerExtensions(node) {
 import { createTransform } from "@gltf-transform/functions";
 
 // src/utils/version.gen.ts
-var version = "3.0.0-next.3fbb1fc";
+var version = "3.0.0-next.73f1606";
 
 // src/utils/version.ts
 function getVersion(_marklocal = !0) {
@@ -3926,10 +3926,10 @@ var AuthError = class extends Error {
   constructor(message) {
     super(message), this.name = "AuthError";
   }
-}, LOCAL_LICENSE_URL = "http://localhost:8424/api/license", LOCAL_FETCH_TIMEOUT_MS = 2e3;
+}, LOCAL_FETCH_TIMEOUT_MS = 2e3;
 async function tryFetchLocalToken(org) {
   try {
-    let url = new URL(LOCAL_LICENSE_URL);
+    let baseUrl = process.env.NEEDLE_LICENSE_SERVER_URL || "http://localhost:8424/api/license", url = new URL(baseUrl);
     org && url.searchParams.set("org", org);
     let res = await fetch(url, {
       signal: AbortSignal.timeout(LOCAL_FETCH_TIMEOUT_MS)
@@ -3941,10 +3941,10 @@ async function tryFetchLocalToken(org) {
     return null;
   }
 }
-async function verifyWithKey(token, key, opts) {
+async function verifyWithKey(token, key) {
   if (!key.alg) throw new AuthError(`trusted key '${key.kid ?? "?"}' is missing 'alg'`);
   let keyObj = await importJWK(key, key.alg);
-  await jwtVerify(token, keyObj, opts?.requireExp ? { requiredClaims: ["exp"] } : void 0);
+  await jwtVerify(token, keyObj);
 }
 async function verifyAuthToken(token) {
   if (!token)
@@ -3957,7 +3957,7 @@ async function verifyAuthToken(token) {
       let match = TRUSTED_KEYS.find((k) => k.kid === header.kid);
       if (!match)
         throw new AuthError(`token signed by unknown key '${header.kid}'`);
-      await verifyWithKey(token, match, { requireExp: !0 });
+      await verifyWithKey(token, match);
     } else {
       let lastError = null;
       for (let key of TRUSTED_KEYS)
@@ -3973,13 +3973,8 @@ async function verifyAuthToken(token) {
     }
   } catch (err) {
     if (err instanceof AuthError) throw err;
-    if (err && typeof err == "object" && "code" in err) {
-      let code = err.code;
-      if (code === "ERR_JWT_EXPIRED")
-        throw new AuthError("token expired");
-      if (code === "ERR_JWT_CLAIM_VALIDATION_FAILED" && "claim" in err && err.claim === "exp")
-        throw new AuthError("token missing 'exp' claim");
-    }
+    if (err && typeof err == "object" && "code" in err && err.code === "ERR_JWT_EXPIRED")
+      throw new AuthError("token expired");
     let message = err instanceof Error ? err.message : String(err);
     throw new AuthError(message);
   }
@@ -3987,7 +3982,9 @@ async function verifyAuthToken(token) {
 async function requireAuth(cliToken, org) {
   let token = typeof cliToken == "string" && cliToken.length > 0 ? cliToken : process.env.NEEDLE_CLOUD_TOKEN;
   if ((!token || typeof token == "string" && token.length === 0) && (token = await tryFetchLocalToken(org ?? process.env.NEEDLE_CLOUD_ORG)), !token)
-    throw new AuthError("pass --auth-token or set NEEDLE_CLOUD_TOKEN (or log in to the needle-cloud CLI)");
+    throw new AuthError(
+      "No valid auth token found. Provide one via --auth-token, NEEDLE_CLOUD_TOKEN env, or log in to the needle-cloud CLI (npx needle-cloud@version-1 start --restart). If you are logged in but still see this error, try updating: npx needle-cloud@version-1 start --restart"
+    );
   await verifyAuthToken(token);
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@needle-tools/gltf-build-pipeline",
-  "version": "3.0.0-next.3fbb1fc",
+  "version": "3.0.0-next.73f1606",
   "description": "Pipeline and tools for optimizing gltf files using gltf-transform and compression settings within glTF extensions",
   "type": "module",
   "exports": {