unity-cli@v1.6.9 (#57)

- skip entitlements check for floating licenses
- add --showContext call when polling for license server configuration updates

Author: StephenHodgson

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@rage-against-the-pixel/unity-cli",
-  "version": "1.6.8",
+  "version": "1.6.9",
   "description": "A command line utility for the Unity Game Engine.",
   "author": "RageAgainstThePixel",
   "license": "MIT",

package.json

@@ -42,7 +42,7 @@ program.command('activate-license')
     .option('-e, --email <email>', 'Email associated with the Unity account. Required when activating a personal or professional license.')
     .option('-p, --password <password>', 'Password for the Unity account. Required when activating a personal or professional license.')
     .option('-s, --serial <serial>', 'License serial number. Required when activating a professional license.')
-    .option('-c, --config <config>', 'Path to the configuration file, or base64 encoded JSON string. Required when activating a floating license.')
+    .option('-c, --config <config>', 'Path to the configuration file, raw JSON, or base64 encoded JSON string. Required when activating a floating license.')
     .option('--verbose', 'Enable verbose logging.')
     .option('--json', 'Prints the last line of output as JSON string.')
     .action(async (options) => {

src/cli.ts

@@ -513,7 +513,8 @@ export class LicensingClient {
             }
             catch (error) {
                 if ((error as NodeJS.ErrnoException).code !== 'ENOENT') {
-                    this.logger.debug(`Failed to inspect licensing client log: ${error}`);
+                    this.logger.error(`Failed to inspect licensing client log: ${error}`);
+                    continue;
                 }
             }
 
@@ -531,11 +532,12 @@ export class LicensingClient {
                     }
 
                     if (notConfiguredPattern.test(line)) {
-                        this.logger.warn('Floating license server is not configured. Waiting for configuration...');
+                        this.logger.debug('Floating license server is not configured. Waiting for configuration...');
                     }
                 }
             }
 
+            await this.exec(['--showContext'], true);
             await new Promise((resolve) => setTimeout(resolve, pollIntervalMs));
         }
 
@@ -561,6 +563,9 @@ export class LicensingClient {
             this.logger.debug(`Using services config at: ${servicesConfigPath}`);
         }
 
+        // For floating licenses, skip the entitlement check
+        skipEntitlementCheck = options.licenseType === LicenseType.floating;
+
         if (!skipEntitlementCheck) {
             const activeLicenses = await this.GetActiveEntitlements();
 
@@ -572,7 +577,6 @@ export class LicensingClient {
 
         switch (options.licenseType) {
             case LicenseType.floating: {
-                await this.Context();
                 await this.waitForLicenseServerConfiguration();
                 const output = await this.exec([`--acquire-floating`], true);
                 const tokenMatch = output.match(/with token:\s*"(?<token>[\w-]+)"/);

src/license-client.ts

@@ -39,22 +39,24 @@ describe('LicensingClient services config handling', () => {
 });
 
 describe('LicensingClient floating activation order', () => {
-    it('prepares services config before checking entitlements', async () => {
+    it('prepares services config without checking entitlements', async () => {
         const client = new LicensingClient();
         const setupSpy = jest.spyOn(client as any, 'setupServicesConfig').mockResolvedValue('/tmp/services-config.json');
         const entitlementsSpy = jest.spyOn(client, 'GetActiveEntitlements').mockResolvedValue([]);
         jest.spyOn(client, 'Context').mockResolvedValue();
-        jest.spyOn(client as any, 'waitForLicenseServerConfiguration').mockResolvedValue(undefined);
-        jest.spyOn(client as any, 'exec').mockResolvedValue('Successfully acquired with token: "token-123"');
+        const waitSpy = jest.spyOn(client as any, 'waitForLicenseServerConfiguration').mockResolvedValue(undefined);
+        const execSpy = jest.spyOn(client as any, 'exec').mockResolvedValue('Successfully acquired with token: "token-123"');
 
         await client.Activate({
             licenseType: LicenseType.floating,
             servicesConfig: '{"floatingServer":"https://example.com"}'
         });
 
         expect(setupSpy).toHaveBeenCalledTimes(1);
-        expect(entitlementsSpy).toHaveBeenCalledTimes(1);
-        expect(entitlementsSpy.mock.invocationCallOrder[0]).toBeGreaterThan(setupSpy.mock.invocationCallOrder[0]);
+        expect(entitlementsSpy).not.toHaveBeenCalled();
+        expect(waitSpy).toHaveBeenCalledTimes(1);
+        expect(execSpy).toHaveBeenCalledTimes(1);
+        expect(execSpy.mock.invocationCallOrder[0]).toBeGreaterThan(waitSpy.mock.invocationCallOrder[0]);
     });
 });
 
@@ -69,6 +71,7 @@ describe('LicensingClient waitForLicenseServerConfiguration', () => {
         const client = new LicensingClient();
         const tempLog = createTempLog();
         jest.spyOn(LicensingClient, 'ClientLogPath').mockReturnValue(tempLog);
+        jest.spyOn(client as any, 'exec').mockResolvedValue('');
 
         setTimeout(() => {
             fs.appendFileSync(tempLog, '\nFloating license server URL is: https://example.com (via config file)\n');
@@ -82,6 +85,7 @@ describe('LicensingClient waitForLicenseServerConfiguration', () => {
         const client = new LicensingClient();
         const tempLog = createTempLog();
         jest.spyOn(LicensingClient, 'ClientLogPath').mockReturnValue(tempLog);
+        jest.spyOn(client as any, 'exec').mockResolvedValue('');
 
         await expect((client as any).waitForLicenseServerConfiguration(200, 10)).rejects.toThrow(/Timed out waiting for floating license server configuration/);
         fs.rmSync(tempLog, { force: true });