@afffun/codexbot 1.0.78 → 1.0.80

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@afffun/codexbot",
-  "version": "1.0.78",
+  "version": "1.0.80",
   "description": "Thin npm bootstrap CLI for installing and operating Codexbot nodes",
   "type": "module",
   "author": "john88188 <john88188@outlook.com>",

package/src/activation_service.mjs

@@ -81,6 +81,30 @@ function buildClaimFailureMessage(error, claimUrl) {
   return lines.join('\n');
 }
 
+function normalizeBaseUrl(value) {
+  const raw = trim(value);
+  if (!raw) return '';
+  try {
+    const url = new URL(raw);
+    url.pathname = '';
+    url.search = '';
+    url.hash = '';
+    return url.toString().replace(/\/+$/g, '');
+  } catch {
+    return raw.replace(/\/+$/g, '');
+  }
+}
+
+function resolveLicenseServerUrl({ claim = {}, claimUrl = '', installBaseUrl = '', licenseServerUrl = '' } = {}) {
+  const explicit = normalizeBaseUrl(licenseServerUrl);
+  if (explicit) return explicit;
+  const claimed = normalizeBaseUrl(claim?.licenseServerUrl);
+  if (claimed) return claimed;
+  const installBase = normalizeBaseUrl(installBaseUrl);
+  if (installBase) return installBase;
+  return normalizeBaseUrl(claimUrl);
+}
+
 export function createNpmDistributionActivationService(deps = {}) {
   const fsPromises = deps.fsPromises || fs;
   const fsSync = deps.fsSync || fsSyncDefault;
@@ -176,7 +200,7 @@ export function createNpmDistributionActivationService(deps = {}) {
     };
   }
 
-  async function runLocalActivationScript(layout, files) {
+  async function runLocalActivationScript(layout, files, options = {}) {
     const scriptPath = pathModule.join(layout.appDir, 'scripts', 'codexbot_activate.sh');
     const isRoot = typeof processImpl.getuid === 'function' ? processImpl.getuid() === 0 : false;
     const baseArgs = [
@@ -185,6 +209,7 @@ export function createNpmDistributionActivationService(deps = {}) {
       '--license-file', files.licenseFile,
       '--license-public-key-file', files.licensePublicKeyFile,
       '--license-server-public-key-file', files.licenseServerPublicKeyFile,
+      ...(trim(options.licenseServerUrl) ? ['--license-server-url', trim(options.licenseServerUrl)] : []),
       '--start',
     ];
     const command = isRoot ? 'bash' : 'sudo';
@@ -217,8 +242,14 @@ export function createNpmDistributionActivationService(deps = {}) {
         throw new Error('claim response is missing activation package files');
       }
       const files = await writeActivationPackage(tempDir, activation);
+      const licenseServerUrl = resolveLicenseServerUrl({
+        claim,
+        claimUrl,
+        installBaseUrl: options.installBaseUrl,
+        licenseServerUrl: options.licenseServerUrl,
+      });
       logger.log('==> Activate installed node');
-      const exitCode = await runLocalActivationScript(layout, files);
+      const exitCode = await runLocalActivationScript(layout, files, { licenseServerUrl });
       if (exitCode !== 0) {
         throw new Error(`activation script exited with code ${exitCode}`);
       }