@bhooai/nexus-crypto 2.0.16 → 2.0.18

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@bhooai/nexus-crypto",
-    "version": "2.0.16",
+    "version": "2.0.18",
     "publishConfig": {
         "access": "public"
     },

package/src/license.ts

@@ -10,23 +10,24 @@
  *
  * Flow:
  *   - `nexus license add` (browser) stores the token at
- *     `<projectRoot>/license/license.jwt`.
+ *     `<projectRoot>/nexus/licence/licence.jwt`.
  *   - Each run calls `ensureLicense()`, which verifies the token (signature via
  *     fetched JWKS + online status) and caches the result in memory for the run.
  *   - Gated features call `requireLicense()` (sync, reads the in-memory result).
  *
  * Lookup order: `NEXUS_LICENSE_KEY` env (CI/containers) →
- * `<projectRoot>/license/license.jwt`. The token is a bearer credential, so the
- * `license/` folder should be gitignored.
+ * `<projectRoot>/nexus/licence/licence.jwt`. The token is a bearer credential, so the
+ * `nexus/licence/` folder should be gitignored.
  */
-import { existsSync, mkdirSync, readFileSync, rmSync, writeFileSync } from 'node:fs';
-import { join } from 'node:path';
+import { existsSync, mkdirSync, readFileSync, readdirSync, rmSync, writeFileSync } from 'node:fs';
+import { join, dirname, resolve } from 'node:path';
 import { createLocalJWKSet, jwtVerify, type JSONWebKeySet } from 'jose';
 
 export const LICENSE_ENV_VAR = 'NEXUS_LICENSE_KEY';
 export const LICENSE_SERVER_ENV_VAR = 'NEXUS_LICENSE_SERVER';
-export const LICENSE_FILE_NAME = 'license.jwt';
-export const LICENSE_DIR_NAME = 'license';
+export const LICENSE_FILE_NAME = 'licence.jwt';
+/** Per-project license folder: `<projectRoot>/nexus/licence/`. */
+export const LICENSE_DIR_NAME = 'nexus/licence';
 export const LICENSE_ISSUER = 'nexus-bhooai-com';
 
 /** Default authority. Override per-project/CI via `NEXUS_LICENSE_SERVER`. */
@@ -85,15 +86,30 @@ export function resolveLicenseToken(opts: ResolveOptions = {}): ResolvedLicense
   const fromEnv = (env[LICENSE_ENV_VAR] ?? '').trim();
   if (fromEnv) return { token: fromEnv, source: 'env' };
 
+  // Candidate roots: an explicit NEXUS_PROJECT_ROOT (set by `nexus dev`, so app
+  // processes whose own projectRoot is a subfolder like `apps/backend` still
+  // find the project's `license/`), then the given projectDir and its parents.
+  const roots: string[] = [];
+  const explicit = (env.NEXUS_PROJECT_ROOT ?? '').trim();
+  if (explicit) roots.push(resolve(explicit));
   if (opts.projectDir) {
-    const file = licenseFilePath(opts.projectDir);
-    if (existsSync(file)) {
-      try {
-        const token = readFileSync(file, 'utf8').trim();
-        if (token) return { token, source: 'file', file };
-      } catch {
-        // unreadable → treated as no license
-      }
+    let dir = resolve(opts.projectDir);
+    for (let i = 0; i < 4; i++) {
+      if (!roots.includes(dir)) roots.push(dir);
+      const parent = dirname(dir);
+      if (parent === dir) break;
+      dir = parent;
+    }
+  }
+
+  for (const root of roots) {
+    const file = licenseFilePath(root);
+    if (!existsSync(file)) continue;
+    try {
+      const token = readFileSync(file, 'utf8').trim();
+      if (token) return { token, source: 'file', file };
+    } catch {
+      // unreadable → try the next root
     }
   }
   return null;
@@ -112,13 +128,27 @@ export function storeLicenseToken(projectDir: string, token: string): string {
 export function removeLicense(projectDir: string): boolean {
   const dir = join(projectDir, LICENSE_DIR_NAME);
   let removed = false;
-  for (const name of [LICENSE_FILE_NAME, 'license.json', 'license.lic']) {
+  for (const name of [LICENSE_FILE_NAME, 'licence.json', 'licence.lic']) {
     const p = join(dir, name);
     if (existsSync(p)) {
       rmSync(p);
       removed = true;
     }
   }
+  // Legacy plain-JSON license folder (pre-`nexus/licence`).
+  const legacyDir = join(projectDir, 'license');
+  for (const name of [LICENSE_FILE_NAME, 'license.jwt', 'license.json', 'license.lic']) {
+    const p = join(legacyDir, name);
+    if (existsSync(p)) {
+      rmSync(p);
+      removed = true;
+    }
+  }
+  try {
+    if (existsSync(legacyDir) && readdirSync(legacyDir).length === 0) rmSync(legacyDir);
+  } catch {
+    // ignore
+  }
   const legacy = join(projectDir, '.nexus-license.json');
   if (existsSync(legacy)) {
     rmSync(legacy);