fix webos nosdk error when run sim

flexn-io · Sep 11, 2024 · c741296 · c741296
1 parent c1d0b69
commit c741296
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 12 deletions.
diff --git a/packages/sdk-webos/src/__tests__/cli.test.ts b/packages/sdk-webos/src/__tests__/cli.test.ts
@@ -76,11 +76,6 @@ describe('checkAndConfigureWebosSdks', () => {
         // GIVEN
         const mockContext = {
             platform: 'webos',
-            // buildConfig: {
-            //     sdks: {
-            //         WEBOS_SDK: '/path/to/sdk',
-            //     },
-            // },
             cli: {},
         };
         (core.getContext as jest.Mock).mockReturnValue(mockContext);

diff --git a/packages/sdk-webos/src/__tests__/deviceManager.test.ts b/packages/sdk-webos/src/__tests__/deviceManager.test.ts
@@ -18,9 +18,9 @@ describe('launchWebOSimulator', () => {
         //GIVEN
         const ctx = getContext();
         ctx.platform = 'webos';
-        ctx.paths.workspace.config = '/path/test';
+        ctx.paths.workspace.config = '/path/test/renative';
         const target = true;
-        const errorMessage = `Your webos SDK path is not configured. Please update your /path/test file`;
+        const errorMessage = `Your webos SDK path is not configured. If you want to run simulator please update your /path/test/renative file with simulator path.`;
 
         jest.mocked(getRealPath).mockReturnValue(undefined);
 

diff --git a/packages/sdk-webos/src/deviceManager.ts b/packages/sdk-webos/src/deviceManager.ts
@@ -20,6 +20,7 @@ import {
     getConfigProp,
     getAppFolder,
     getContext,
+    logError,
 } from '@rnv/core';
 import { WebosDevice } from './types';
 import {
@@ -40,7 +41,7 @@ export const launchWebOSimulator = async (target: string | boolean) => {
     if (!webosSdkPath) {
         return Promise.reject(
             `Your ${c.platform} SDK path is not configured. Please update your ${c.paths.workspace.config} file`
-            );
+        );
     }
     const availableSimulatorVersions = getDirectories(path.join(webosSdkPath, 'Simulator'));
 
@@ -132,10 +133,9 @@ const launchAppOnSimulator = async (c: RnvContext, appPath: string) => {
 
     const webosSdkPath = getRealPath(c.buildConfig?.sdks?.WEBOS_SDK);
 
-
     if (!webosSdkPath) {
         return Promise.reject(
-            `Your ${c.platform} SDK path is not configured. Please update your ${c.paths.workspace.config} file`
+            `Your ${c.platform} SDK path is not configured. If you want to run simulator please update your ${c.paths.workspace.config} file with simulator path.`
         );
     }
 
@@ -227,7 +227,7 @@ export const listWebOSTargets = async () => {
     if (!webosSdkPath) {
         return Promise.reject(
             `Your ${c.platform} SDK path is not configured. Please update your ${c.paths.workspace.config} file`
-            );
+        );
     }
     const availableSimulatorVersions = getDirectories(path.join(webosSdkPath, 'Simulator'));
     availableSimulatorVersions.map((a) => {
@@ -333,7 +333,11 @@ export const runWebosSimOrDevice = async () => {
                 return installAndLaunchApp(response.chosenDevice, appPath, tId);
             }
         } else {
-            return launchAppOnSimulator(c, appLocation);
+            try {
+                return await launchAppOnSimulator(c, appLocation);
+            } catch (error) {
+                return logError(`${error}`);
+            }
         }
     } else {
         // Target specified, using that