@ukeyfe/hardware-core 1.1.24 → 1.1.26

package/src/api/cardano/CardanoSignMessage.ts

@@ -3,7 +3,8 @@ import { PROTO } from '../../constants';
 import { UI_REQUEST } from '../../constants/ui-request';
 import { validateParams } from '../helpers/paramsValidator';
 import { validatePath } from '../helpers/pathUtils';
-import { CardanoSignMessageParams } from '../../types/api/cardanoSignMessage';
+
+import type { CardanoSignMessageParams } from '../../types/api/cardanoSignMessage';
 
 export default class CardanoSignMessage extends BaseMethod<CardanoSignMessageParams> {
   hasBundle?: boolean;

package/src/api/cardano/CardanoSignTransaction.ts

@@ -1,35 +1,36 @@
 import semver from 'semver';
 import { ERRORS, HardwareErrorCode } from '@ukeyfe/hardware-shared';
+
 import { BaseMethod } from '../BaseMethod';
 import { PROTO } from '../../constants';
 import { UI_REQUEST } from '../../constants/ui-request';
 import { validateParams } from '../helpers/paramsValidator';
 import {
-  transformInput,
-  Path,
-  CollateralInputWithPath,
   transformCollateralInput,
+  transformInput,
   transformReferenceInput,
 } from './helper/cardanoInputs';
-import { transformOutput, sendOutput } from './helper/cardanoOutputs';
+import { sendOutput, transformOutput } from './helper/cardanoOutputs';
 import { transformCertificate } from './helper/certificate';
 import { tokenBundleToProto } from './helper/token';
 import {
-  transformAuxiliaryData,
   modifyAuxiliaryDataForBackwardsCompatibility,
+  transformAuxiliaryData,
 } from './helper/auxiliaryData';
 import { gatherWitnessPaths } from './helper/witnesses';
 import { validatePath } from '../helpers/pathUtils';
+import { getDeviceFirmwareVersion, getMethodVersionRange } from '../../utils';
+
+import type { DeviceFirmwareRange } from '../../types';
+import type { CollateralInputWithPath, Path } from './helper/cardanoInputs';
 import type {
-  CertificateWithPoolOwnersAndRelays,
   AssetGroupWithTokens,
-  CardanoSignedTxData,
-  CardanoSignedTxWitness,
   CardanoAuxiliaryDataSupplement,
   CardanoSignTransaction as CardanoSignTransactionType,
+  CardanoSignedTxData,
+  CardanoSignedTxWitness,
+  CertificateWithPoolOwnersAndRelays,
 } from '../../types/api/cardano';
-import { DeviceFirmwareRange } from '../../types';
-import { getDeviceFirmwareVersion, getMethodVersionRange } from '../../utils';
 
 export default class CardanoSignTransaction extends BaseMethod<any> {
   hasBundle?: boolean;

package/src/api/cardano/helper/addressParameters.ts

@@ -1,7 +1,9 @@
 import { ERRORS, HardwareErrorCode } from '@ukeyfe/hardware-shared';
+
 import { validatePath } from '../../helpers/pathUtils';
 import { validateParams } from '../../helpers/paramsValidator';
 import { PROTO } from '../../../constants';
+
 import type { CardanoAddressParameters } from '../../../types/api/cardano';
 
 export const validateAddressParameters = (addressParameters: CardanoAddressParameters) => {

package/src/api/cardano/helper/auxiliaryData.ts

@@ -1,17 +1,19 @@
 import { ERRORS, HardwareErrorCode } from '@ukeyfe/hardware-shared';
+
 import {
-  validateAddressParameters,
   addressParametersToProto,
   modifyAddressParametersForBackwardsCompatibility,
+  validateAddressParameters,
 } from './addressParameters';
 import { validateParams } from '../../helpers/paramsValidator';
 import { validatePath } from '../../helpers/pathUtils';
+
+import type { PROTO } from '../../../constants';
 import type {
   CardanoAuxiliaryData,
-  CardanoCVoteRegistrationParameters,
   CardanoCVoteRegistrationDelegation,
+  CardanoCVoteRegistrationParameters,
 } from '../../../types/api/cardano';
-import { PROTO } from '../../../constants';
 
 const MAX_DELEGATION_COUNT = 32;
 

package/src/api/cardano/helper/cardanoInputs.ts

@@ -1,5 +1,6 @@
 import { validateParams } from '../../helpers/paramsValidator';
 import { validatePath } from '../../helpers/pathUtils';
+
 import type { PROTO } from '../../../constants';
 
 export type Path = number[];

package/src/api/cardano/helper/cardanoOutputs.ts

@@ -2,6 +2,7 @@ import { validateParams } from '../../helpers/paramsValidator';
 import { tokenBundleToProto } from './token';
 import { addressParametersToProto, validateAddressParameters } from './addressParameters';
 import { hexStringByteLength, sendChunkedHexString } from './utils';
+
 import type { PROTO } from '../../../constants';
 import type { AssetGroupWithTokens } from '../../../types/api/cardano';
 

package/src/api/cardano/helper/certificate.ts

@@ -1,17 +1,19 @@
 import { ERRORS, HardwareErrorCode } from '@ukeyfe/hardware-shared';
+
 import { validateParams } from '../../helpers/paramsValidator';
 import { validatePath } from '../../helpers/pathUtils';
+import { PROTO } from '../../../constants';
+
 import type {
   CardanoCertificate,
-  CardanoPoolParameters,
-  CertificateWithPoolOwnersAndRelays,
+  CardanoDRep,
   CardanoPoolMargin,
   CardanoPoolMetadata,
-  CardanoPoolRelay,
   CardanoPoolOwner,
-  CardanoDRep,
+  CardanoPoolParameters,
+  CardanoPoolRelay,
+  CertificateWithPoolOwnersAndRelays,
 } from '../../../types/api/cardano';
-import { PROTO } from '../../../constants';
 
 export type PoolParametersWithOwnersAndRelays = {
   poolParameters?: PROTO.CardanoPoolParametersType;

package/src/api/cardano/helper/token.ts

@@ -1,7 +1,8 @@
 import { validateParams } from '../../helpers/paramsValidator';
+
 import type {
-  CardanoAssetGroup,
   AssetGroupWithTokens,
+  CardanoAssetGroup,
   CardanoToken,
 } from '../../../types/api/cardano';
 import type { PROTO } from '../../../constants';

package/src/api/cardano/helper/witnesses.ts

@@ -1,7 +1,8 @@
-import type { CertificateWithPoolOwnersAndRelays } from '../../../types/api/cardano';
-import { CollateralInputWithPath, InputWithPath, Path } from './cardanoInputs';
 import { PROTO } from '../../../constants';
 
+import type { CollateralInputWithPath, InputWithPath, Path } from './cardanoInputs';
+import type { CertificateWithPoolOwnersAndRelays } from '../../../types/api/cardano';
+
 export const gatherWitnessPaths = (
   inputsWithPath: InputWithPath[],
   certificatesWithPoolOwnersAndRelays: CertificateWithPoolOwnersAndRelays[],

package/src/api/conflux/ConfluxGetAddress.ts

@@ -1,9 +1,10 @@
-import { ConfluxGetAddress as HardwareConfluxGetAddress } from '@ukeyfe/hardware-transport';
 import { UI_REQUEST } from '../../constants/ui-request';
 import { serializedPath, validatePath } from '../helpers/pathUtils';
 import { BaseMethod } from '../BaseMethod';
 import { validateParams, validateResult } from '../helpers/paramsValidator';
-import { ConfluxAddress, ConfluxGetAddressParams } from '../../types/api/confluxGetAddress';
+
+import type { ConfluxGetAddress as HardwareConfluxGetAddress } from '@ukeyfe/hardware-transport';
+import type { ConfluxAddress, ConfluxGetAddressParams } from '../../types/api/confluxGetAddress';
 
 export default class ConfluxGetAddress extends BaseMethod<HardwareConfluxGetAddress[]> {
   hasBundle = false;

package/src/api/conflux/ConfluxSignMessage.ts

@@ -1,10 +1,11 @@
-import { ConfluxSignMessage as HardwareConfluxSignMessage } from '@ukeyfe/hardware-transport';
 import { UI_REQUEST } from '../../constants/ui-request';
 import { validatePath } from '../helpers/pathUtils';
 import { BaseMethod } from '../BaseMethod';
 import { validateParams } from '../helpers/paramsValidator';
 import { formatAnyHex } from '../helpers/hexUtils';
 
+import type { ConfluxSignMessage as HardwareConfluxSignMessage } from '@ukeyfe/hardware-transport';
+
 export default class ConfluxSignMessage extends BaseMethod<HardwareConfluxSignMessage> {
   init() {
     this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.NOT_INITIALIZE];

package/src/api/conflux/ConfluxSignMessageCIP23.ts

@@ -1,10 +1,11 @@
-import { ConfluxSignMessageCIP23 as HardwareConfluxSignMessageCIP23 } from '@ukeyfe/hardware-transport';
 import { UI_REQUEST } from '../../constants/ui-request';
 import { validatePath } from '../helpers/pathUtils';
 import { BaseMethod } from '../BaseMethod';
 import { validateParams } from '../helpers/paramsValidator';
 import { formatAnyHex } from '../helpers/hexUtils';
 
+import type { ConfluxSignMessageCIP23 as HardwareConfluxSignMessageCIP23 } from '@ukeyfe/hardware-transport';
+
 export default class ConfluxSignMessageCIP23 extends BaseMethod<HardwareConfluxSignMessageCIP23> {
   init() {
     this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.NOT_INITIALIZE];

package/src/api/conflux/ConfluxSignTransaction.ts

@@ -1,19 +1,20 @@
-import { ConfluxSignTx, ConfluxTxRequest } from '@ukeyfe/hardware-transport';
 import { ERRORS, HardwareErrorCode } from '@ukeyfe/hardware-shared';
-import {
-  ConfluxSignedTx,
-  ConfluxSignTransactionParams,
-  ConfluxTransaction,
-} from '../../types/api/confluxSignTransaction';
 
 import { UI_REQUEST } from '../../constants/ui-request';
 import { validatePath } from '../helpers/pathUtils';
 import { BaseMethod } from '../BaseMethod';
-import { SchemaParam, validateParams } from '../helpers/paramsValidator';
-
+import { validateParams } from '../helpers/paramsValidator';
 import { cutString } from '../helpers/stringUtils';
 import { formatAnyHex, stripHexStartZeroes } from '../helpers/hexUtils';
 
+import type { SchemaParam } from '../helpers/paramsValidator';
+import type {
+  ConfluxSignTransactionParams,
+  ConfluxSignedTx,
+  ConfluxTransaction,
+} from '../../types/api/confluxSignTransaction';
+import type { ConfluxSignTx, ConfluxTxRequest } from '@ukeyfe/hardware-transport';
+
 export default class ConfluxSignTransaction extends BaseMethod {
   addressN: number[] = [];
 

package/src/api/cosmos/CosmosGetAddress.ts

@@ -1,9 +1,9 @@
-import { CosmosGetAddress as HardwareCosmosGetAddress } from '@ukeyfe/hardware-transport';
-
 import { serializedPath, validatePath } from '../helpers/pathUtils';
 import { BaseMethod } from '../BaseMethod';
 import { validateParams, validateResult } from '../helpers/paramsValidator';
-import { CosmosAddress, CosmosGetAddressParams } from '../../types';
+
+import type { CosmosGetAddress as HardwareCosmosGetAddress } from '@ukeyfe/hardware-transport';
+import type { CosmosAddress, CosmosGetAddressParams } from '../../types';
 
 export default class CosmosGetAddress extends BaseMethod<HardwareCosmosGetAddress[]> {
   hasBundle = false;

package/src/api/cosmos/CosmosGetPublicKey.ts

@@ -2,9 +2,10 @@ import { UI_REQUEST } from '../../constants/ui-request';
 import { serializedPath, validatePath } from '../helpers/pathUtils';
 import { BaseMethod } from '../BaseMethod';
 import { validateParams, validateResult } from '../helpers/paramsValidator';
-import type { CosmosAddress, CosmosGetPublicKeyParams } from '../../types';
 import { batchGetPublickeys } from '../helpers/batchGetPublickeys';
 
+import type { CosmosAddress, CosmosGetPublicKeyParams } from '../../types';
+
 export default class CosmosGetPublicKey extends BaseMethod<any> {
   hasBundle = false;
 

package/src/api/cosmos/CosmosSignTransaction.ts

@@ -1,10 +1,13 @@
-import { CosmosSignTx as HardwareCosmosSignTx } from '@ukeyfe/hardware-transport';
+import { ERRORS, HardwareErrorCode } from '@ukeyfe/hardware-shared';
+
 import { serializedPath, validatePath } from '../helpers/pathUtils';
 import { BaseMethod } from '../BaseMethod';
 import { validateParams } from '../helpers/paramsValidator';
-import { CosmosSignTransactionParams } from '../../types';
 import { formatAnyHex } from '../helpers/hexUtils';
 
+import type { CosmosSignTx as HardwareCosmosSignTx } from '@ukeyfe/hardware-transport';
+import type { CosmosSignTransactionParams } from '../../types';
+
 export default class CosmosSignTransaction extends BaseMethod<HardwareCosmosSignTx> {
   hasBundle = false;
 
@@ -40,15 +43,26 @@ export default class CosmosSignTransaction extends BaseMethod<HardwareCosmosSign
   }
 
   async run() {
-    const res = await this.device.commands.typedCall('CosmosSignTx', 'CosmosSignedTx', {
-      ...this.params,
-    });
+    try {
+      const res = await this.device.commands.typedCall('CosmosSignTx', 'CosmosSignedTx', {
+        ...this.params,
+      });
 
-    const { signature } = res.message;
+      const { signature } = res.message;
 
-    return {
-      path: serializedPath(this.params.address_n),
-      signature,
-    };
+      return {
+        path: serializedPath(this.params.address_n),
+        signature,
+      };
+    } catch (error) {
+      const { message } = error;
+      if (
+        message.includes('Failure_DataError,Json parse failed') ||
+        message.includes('Failure_DataError,Invalid message')
+      ) {
+        throw ERRORS.TypedError(HardwareErrorCode.CosmosInvalidJsonMessage, message);
+      }
+      throw error;
+    }
   }
 }

package/src/api/device/DeviceBackup.ts

@@ -1,6 +1,7 @@
-import { BackupDevice } from '@ukeyfe/hardware-transport';
 import { BaseMethod } from '../BaseMethod';
 
+import type { BackupDevice } from '@ukeyfe/hardware-transport';
+
 export default class DeviceBackup extends BaseMethod<BackupDevice> {
   init() {
     this.useDevicePassphraseState = false;

package/src/api/device/DeviceCancel.ts

@@ -1,6 +1,7 @@
-import { Cancel } from '@ukeyfe/hardware-transport';
 import { BaseMethod } from '../BaseMethod';
 
+import type { Cancel } from '@ukeyfe/hardware-transport';
+
 export default class DeviceCancel extends BaseMethod<Cancel> {
   init() {
     this.useDevicePassphraseState = false;

package/src/api/device/DeviceChangePin.ts

@@ -1,7 +1,8 @@
-import { ChangePin } from '@ukeyfe/hardware-transport';
 import { BaseMethod } from '../BaseMethod';
 import { validateParams } from '../helpers/paramsValidator';
 
+import type { ChangePin } from '@ukeyfe/hardware-transport';
+
 export default class DeviceChangePin extends BaseMethod<ChangePin> {
   init() {
     this.useDevicePassphraseState = false;

package/src/api/device/DeviceFlags.ts

@@ -1,7 +1,8 @@
-import { ApplyFlags } from '@ukeyfe/hardware-transport';
 import { BaseMethod } from '../BaseMethod';
 import { validateParams } from '../helpers/paramsValidator';
 
+import type { ApplyFlags } from '@ukeyfe/hardware-transport';
+
 export default class DeviceFlags extends BaseMethod<ApplyFlags> {
   init() {
     this.useDevicePassphraseState = false;

package/src/api/device/DeviceFullyUploadResource.ts

@@ -1,14 +1,18 @@
-import { Deferred, EDeviceType } from '@ukeyfe/hardware-shared';
+import { EDeviceType } from '@ukeyfe/hardware-shared';
 import semver from 'semver';
+
 import { UI_REQUEST } from '../../constants/ui-request';
 import { BaseMethod } from '../BaseMethod';
 import { getSysResourceBinary } from '../firmware/getBinary';
 import { updateResources } from '../firmware/uploadFirmware';
-import { getDeviceType, getDeviceFirmwareVersion } from '../../utils';
+import { getDeviceFirmwareVersion, getDeviceType, getFirmwareType } from '../../utils';
 import { createUiMessage } from '../../events/ui-request';
-import type { KnownDevice, Features } from '../../types';
 import { DataManager } from '../../data-manager';
 
+import type { Deferred } from '@ukeyfe/hardware-shared';
+import type { Features, KnownDevice } from '../../types';
+import type { DeviceFullyUploadResourceParams } from '../../types/api/deviceFullyUploadResource';
+
 export default class DeviceFullyUploadResource extends BaseMethod {
   checkPromise: Deferred<any> | null = null;
 
@@ -43,13 +47,18 @@ export default class DeviceFullyUploadResource extends BaseMethod {
     const { device } = this;
     const { features } = device;
 
+    const payload = this.payload as DeviceFullyUploadResourceParams;
+
+    const deviceFirmwareType = getFirmwareType(features);
+    const firmwareType = payload.firmwareType ?? deviceFirmwareType;
+
     if (!features?.bootloader_mode && features) {
       // check & upgrade firmware resource
       if (features) {
         let { binary } = this.payload;
         if (!binary) {
           this.postTipMessage('CheckLatestUiResource');
-          const resourceUrl = DataManager.getSysFullResource(features);
+          const resourceUrl = DataManager.getSysFullResource(features, firmwareType);
           if (resourceUrl) {
             this.postTipMessage('DownloadLatestUiResource');
             const resource = await getSysResourceBinary(resourceUrl);

package/src/api/device/DeviceLock.ts

@@ -1,6 +1,7 @@
-import { LockDevice } from '@ukeyfe/hardware-transport';
 import { BaseMethod } from '../BaseMethod';
 
+import type { LockDevice } from '@ukeyfe/hardware-transport';
+
 export default class DeviceLock extends BaseMethod<LockDevice> {
   init() {
     this.useDevicePassphraseState = false;

package/src/api/device/DeviceRebootToBoardloader.ts

@@ -1,4 +1,5 @@
 import { BaseMethod } from '../BaseMethod';
+
 import type { RebootToBoardloaderParams } from '../../types/api/deviceRebootToBoardloader';
 
 // Reboot BoardLoader

package/src/api/device/DeviceRebootToBootloader.ts

@@ -1,6 +1,7 @@
-import { RebootToBootloader } from '@ukeyfe/hardware-transport';
 import { BaseMethod } from '../BaseMethod';
 
+import type { RebootToBootloader } from '@ukeyfe/hardware-transport';
+
 // Reboot BootLoader
 export default class DeviceRebootToBootloader extends BaseMethod<RebootToBootloader> {
   init() {

package/src/api/device/DeviceRecovery.ts

@@ -1,7 +1,8 @@
-import { RecoveryDevice } from '@ukeyfe/hardware-transport';
 import { BaseMethod } from '../BaseMethod';
 import { validateParams } from '../helpers/paramsValidator';
 
+import type { RecoveryDevice } from '@ukeyfe/hardware-transport';
+
 export default class DeviceRecovery extends BaseMethod<RecoveryDevice> {
   init() {
     this.useDevicePassphraseState = false;

package/src/api/device/DeviceReset.ts

@@ -1,7 +1,8 @@
-import { ResetDevice } from '@ukeyfe/hardware-transport';
 import { BaseMethod } from '../BaseMethod';
 import { validateParams } from '../helpers/paramsValidator';
 
+import type { ResetDevice } from '@ukeyfe/hardware-transport';
+
 export default class DeviceReset extends BaseMethod<ResetDevice> {
   init() {
     this.useDevicePassphraseState = false;

package/src/api/device/DeviceSettings.ts

@@ -1,6 +1,10 @@
-import { ApplySettings } from '@ukeyfe/hardware-transport';
+import { HardwareErrorCode, TypedError } from '@ukeyfe/hardware-shared';
+
 import { BaseMethod } from '../BaseMethod';
 import { validateParams } from '../helpers/paramsValidator';
+import { LANGUAGE_LABELS } from '../../utils/deviceSettings';
+
+import type { ApplySettings } from '@ukeyfe/hardware-transport';
 
 export default class DeviceSettings extends BaseMethod<ApplySettings> {
   init() {
@@ -18,6 +22,9 @@ export default class DeviceSettings extends BaseMethod<ApplySettings> {
       { name: 'passphraseAlwaysOnDevice', type: 'boolean' },
       { name: 'safetyChecks', type: 'number' },
       { name: 'experimentalFeatures', type: 'boolean' },
+      { name: 'autoShutdownDelayMs', type: 'number' },
+      { name: 'changeBrightness', type: 'boolean' },
+      { name: 'hapticFeedback', type: 'boolean' },
     ]);
 
     // init params
@@ -32,6 +39,11 @@ export default class DeviceSettings extends BaseMethod<ApplySettings> {
       passphrase_always_on_device: this.payload.passphraseAlwaysOnDevice,
       safety_checks: this.payload.safetyChecks,
       experimental_features: this.payload.experimentalFeatures,
+      auto_shutdown_delay_ms: this.payload.autoShutdownDelayMs,
+      ...(this.payload.changeBrightness
+        ? { change_brightness: this.payload.changeBrightness }
+        : undefined),
+      haptic_feedback: this.payload.hapticFeedback,
     };
   }
 
@@ -47,10 +59,38 @@ export default class DeviceSettings extends BaseMethod<ApplySettings> {
   }
 
   async run() {
-    const res = await this.device.commands.typedCall('ApplySettings', 'Success', {
-      ...this.params,
-    });
+    try {
+      const res = await this.device.commands.typedCall('ApplySettings', 'Success', {
+        ...this.params,
+      });
+      return res.message;
+    } catch (error) {
+      if (error.message?.toLowerCase().includes('no setting provided')) {
+        return Promise.reject(
+          TypedError(HardwareErrorCode.DeviceSettingsNotProvided, error.message)
+        );
+      }
+      if (error.message?.includes('all support ISO_639-1 language keys include')) {
+        const supportedLanguages: string[] = error.message
+          ?.replace('all support ISO_639-1 language keys include', '')
+          ?.trim()
+          ?.split(' ');
 
-    return Promise.resolve(res.message);
+        const errorMessage = supportedLanguages.reduce((acc, language) => {
+          const label = LANGUAGE_LABELS?.[language as keyof typeof LANGUAGE_LABELS];
+          if (label) {
+            acc.push(label);
+          }
+          return acc;
+        }, [] as string[]);
+
+        return Promise.reject(
+          TypedError(HardwareErrorCode.DeviceSettingsLanguageNotSupport, error.message, {
+            languages: errorMessage.join(', '),
+          })
+        );
+      }
+      throw error;
+    }
   }
 }

package/src/api/device/DeviceSupportFeatures.ts

@@ -1,4 +1,5 @@
 import { ERRORS, HardwareErrorCode } from '@ukeyfe/hardware-shared';
+
 import {
   supportInputPinOnSoftware,
   supportModifyHomescreen,

package/src/api/device/DeviceUnlock.ts

@@ -1,6 +1,7 @@
-import { LockDevice } from '@ukeyfe/hardware-transport';
 import { BaseMethod } from '../BaseMethod';
 
+import type { LockDevice } from '@ukeyfe/hardware-transport';
+
 export default class DeviceUnlock extends BaseMethod<LockDevice> {
   init() {
     this.useDevicePassphraseState = false;