OTA ID Fallback (#190)

webosbrew · Feb 5, 2024 · 56926a0 · 56926a0
1 parent 9861c34
commit 56926a0
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/src/app/core/services/device-manager.service.ts b/src/app/core/services/device-manager.service.ts
@@ -110,14 +110,21 @@ export class DeviceManagerService extends BackendClient {
     async getDeviceInfo(device: DeviceLike): Promise<Partial<DeviceInfo>> {
         const systemInfo = await this.luna.call<SystemInfo>(device, 'luna://com.webos.service.tv.systemproperty/getSystemInfo', {
             keys: ['firmwareVersion', 'modelName', 'sdkVersion', 'otaId']
-        });
+        }, true, false);
         const osInfo = await this.luna.call<Partial<OsInfo>>(device, 'luna://com.palm.systemservice/osInfo/query', {
             parameters: ['webos_manufacturing_version', 'webos_release']
         }).catch(() => null);
         return {
             modelName: systemInfo.modelName,
             osVersion: osInfo?.webos_release || systemInfo.sdkVersion,
-            otaId: systemInfo.otaId,
+            otaId: systemInfo.otaId || await this.luna.call<{
+                billingId?: string
+            }>(device, 'luna://com.webos.service.sdx/getDeviceUuid', {}).then((ret) => {
+                if (!ret.billingId) {
+                    return undefined;
+                }
+                return new URLSearchParams(ret.billingId).get('modelName') ?? undefined;
+            }).catch(() => undefined),
             firmwareVersion: systemInfo.firmwareVersion
         };
     }

diff --git a/src/app/core/services/remote-luna.service.ts b/src/app/core/services/remote-luna.service.ts
@@ -24,7 +24,8 @@ export class RemoteLunaService {
   constructor(private commands: RemoteCommandService) {
   }
 
-  async call<T extends LunaResponse>(device: DeviceLike, uri: string, param: Record<string, unknown> = {}, pub: boolean = true): Promise<T> {
+  async call<T extends LunaResponse>(device: DeviceLike, uri: string, param: Record<string, unknown> = {}, pub: boolean = true,
+                                     falseAsError: boolean = true): Promise<T> {
     const sendCmd = pub ? 'luna-send-pub' : 'luna-send';
     return this.commands.exec(device, `${sendCmd} -n 1 ${uri} ${escapeSingleQuoteString(JSON.stringify(param))}`, 'utf-8')
       .catch(e => {
@@ -45,7 +46,9 @@ export class RemoteLunaService {
           if (typed['errorText']?.startsWith('Unknown method')) {
               throw new LunaUnknownMethodError(typed);
           }
-          throw new LunaResponseError(typed);
+          if (falseAsError) {
+            throw new LunaResponseError(typed);
+          }
         }
         return typed;
       });