@onekeyfe/hd-core 1.2.0-alpha.19 → 1.2.0-alpha.20

package/src/utils/networkUtils.ts

@@ -1,25 +1,281 @@
-import axios from 'axios';
+import axios, { type AxiosResponse } from 'axios';
 
-export const httpRequest = async (url: string, type = 'text') => {
+export type HttpRequestOptions = {
+  /** Axios adapter-defined request timeout retained for existing opt-in callers. */
+  timeoutMs?: number;
+  /** Deadline for DNS, connection, TLS, redirects, and the first response-body progress. */
+  connectTimeoutMs?: number;
+  /** Maximum idle interval between response-body progress events. */
+  readTimeoutMs?: number;
+  /** Wall-clock deadline across all attempts and retry backoff. */
+  overallTimeoutMs?: number;
+  maxRetries?: number;
+  retryDelayMs?: number;
+};
+
+const MAX_RETRY_COUNT = 3;
+const REQUEST_PHASE_TIMEOUT_CODES = {
+  connect: 'ECONNECTTIMEDOUT',
+  read: 'EREADTIMEDOUT',
+} as const;
+const RETRYABLE_HTTP_STATUSES = new Set([500, 502, 503, 504]);
+const RETRYABLE_NETWORK_ERROR_CODES = new Set([
+  REQUEST_PHASE_TIMEOUT_CODES.connect,
+  REQUEST_PHASE_TIMEOUT_CODES.read,
+  'ECONNABORTED',
+  'ECONNREFUSED',
+  'ECONNRESET',
+  'EHOSTUNREACH',
+  'ENETDOWN',
+  'ENETUNREACH',
+  'ENOTFOUND',
+  'EAI_AGAIN',
+  'ERR_NETWORK',
+  'ETIMEDOUT',
+]);
+
+const createAbortError = () => {
+  const error = new Error('httpRequest aborted');
+  error.name = 'AbortError';
+  return error;
+};
+
+const createOverallTimeoutError = (url: string, timeoutMs: number) => {
+  const error = new Error(`httpRequest overall timeout: ${url} ${timeoutMs}ms`);
+  error.name = 'HttpRequestOverallTimeoutError';
+  return error;
+};
+
+const createRequestPhaseTimeoutError = (
+  url: string,
+  phase: keyof typeof REQUEST_PHASE_TIMEOUT_CODES,
+  timeoutMs: number
+) => {
+  const error = new Error(`httpRequest ${phase} timeout: ${url} ${timeoutMs}ms`);
+  error.name = 'HttpRequestPhaseTimeoutError';
+  return Object.assign(error, {
+    code: REQUEST_PHASE_TIMEOUT_CODES[phase],
+  });
+};
+
+const waitForRetry = async (delayMs: number, attempt: number, signal?: AbortSignal) => {
+  const backoffMs = delayMs * 2 ** attempt;
+  if (backoffMs <= 0) {
+    return;
+  }
+  await new Promise<void>((resolve, reject) => {
+    const timeoutTimer = setTimeout(() => {
+      signal?.removeEventListener('abort', handleAbort);
+      resolve();
+    }, backoffMs);
+    const handleAbort = () => {
+      clearTimeout(timeoutTimer);
+      reject(createAbortError());
+    };
+    if (signal?.aborted) {
+      handleAbort();
+      return;
+    }
+    signal?.addEventListener('abort', handleAbort, { once: true });
+  });
+};
+
+const isRetryableRequestError = (error: unknown) => {
+  if (axios.isCancel(error)) {
+    return false;
+  }
+  if (
+    typeof error === 'object' &&
+    error !== null &&
+    'code' in error &&
+    typeof error.code === 'string' &&
+    RETRYABLE_NETWORK_ERROR_CODES.has(error.code)
+  ) {
+    return true;
+  }
+  if (!axios.isAxiosError(error)) {
+    return false;
+  }
+  const status = error.response?.status;
+  if (status !== undefined) {
+    return RETRYABLE_HTTP_STATUSES.has(Number(status));
+  }
+  return false;
+};
+
+export const httpRequest = async <T = unknown>(
+  url: string,
+  type = 'text',
+  options: HttpRequestOptions = {}
+): Promise<T> => {
   const headers: any = {};
   if (url.indexOf('ngrok-free.app') > -1) {
     headers['ngrok-skip-browser-warning'] = true;
   }
-  const response = await axios.request({
-    url,
-    withCredentials: false,
-    responseType: type === 'binary' ? 'arraybuffer' : 'json',
-    headers,
-  });
 
-  if (+response.status === 200) {
-    if (type === 'json') {
-      return response.data;
+  const timeoutMs =
+    Number.isSafeInteger(options.timeoutMs) && Number(options.timeoutMs) > 0
+      ? Number(options.timeoutMs)
+      : undefined;
+  const connectTimeoutMs =
+    Number.isSafeInteger(options.connectTimeoutMs) && Number(options.connectTimeoutMs) > 0
+      ? Number(options.connectTimeoutMs)
+      : undefined;
+  const readTimeoutMs =
+    Number.isSafeInteger(options.readTimeoutMs) && Number(options.readTimeoutMs) > 0
+      ? Number(options.readTimeoutMs)
+      : undefined;
+  const overallTimeoutMs =
+    Number.isSafeInteger(options.overallTimeoutMs) && Number(options.overallTimeoutMs) > 0
+      ? Number(options.overallTimeoutMs)
+      : undefined;
+  const maxRetries =
+    Number.isSafeInteger(options.maxRetries) && Number(options.maxRetries) > 0
+      ? Math.min(Number(options.maxRetries), MAX_RETRY_COUNT)
+      : 0;
+  const retryDelayMs =
+    Number.isSafeInteger(options.retryDelayMs) && Number(options.retryDelayMs) > 0
+      ? Number(options.retryDelayMs)
+      : 0;
+  const overallTimeoutError = overallTimeoutMs
+    ? createOverallTimeoutError(url, overallTimeoutMs)
+    : undefined;
+  const overallDeadlineAt = overallTimeoutMs ? Date.now() + overallTimeoutMs : undefined;
+  const assertWithinOverallDeadline = () => {
+    if (overallDeadlineAt !== undefined && overallTimeoutError && Date.now() >= overallDeadlineAt) {
+      throw overallTimeoutError;
+    }
+  };
+
+  const request = async (attempt: number, signal?: AbortSignal): Promise<T> => {
+    assertWithinOverallDeadline();
+    if (signal?.aborted) {
+      throw createAbortError();
+    }
+
+    let response: AxiosResponse<T> | undefined;
+    let requestError: unknown;
+    let requestFailed = false;
+    let phaseTimeoutError: ReturnType<typeof createRequestPhaseTimeoutError> | undefined;
+    let phaseTimeoutTimer: ReturnType<typeof setTimeout> | undefined;
+    const hasPhaseDeadline = Boolean(connectTimeoutMs || readTimeoutMs);
+    const attemptController = signal || hasPhaseDeadline ? new AbortController() : undefined;
+    let attemptSettled = false;
+    let lastProgressLoaded = 0;
+    const handleParentAbort = () => {
+      attemptController?.abort();
+    };
+    const clearPhaseTimeout = () => {
+      if (phaseTimeoutTimer) {
+        clearTimeout(phaseTimeoutTimer);
+        phaseTimeoutTimer = undefined;
+      }
+    };
+    const armPhaseTimeout = (
+      phase: keyof typeof REQUEST_PHASE_TIMEOUT_CODES,
+      phaseTimeoutMs: number | undefined
+    ) => {
+      clearPhaseTimeout();
+      if (!phaseTimeoutMs || !attemptController) {
+        return;
+      }
+      phaseTimeoutTimer = setTimeout(() => {
+        phaseTimeoutError = createRequestPhaseTimeoutError(url, phase, phaseTimeoutMs);
+        attemptController.abort();
+      }, phaseTimeoutMs);
+    };
+
+    if (signal) {
+      signal.addEventListener('abort', handleParentAbort, { once: true });
+    }
+    armPhaseTimeout('connect', connectTimeoutMs);
+
+    try {
+      response = await axios.request<T>({
+        url,
+        withCredentials: false,
+        responseType: type === 'binary' ? 'arraybuffer' : 'json',
+        headers,
+        ...(timeoutMs ? { timeout: timeoutMs } : {}),
+        ...(attemptController ? { signal: attemptController.signal } : {}),
+        ...(hasPhaseDeadline
+          ? {
+              adapter: ['xhr', 'http'],
+              onDownloadProgress: (progressEvent: { loaded: number }) => {
+                if (
+                  attemptSettled ||
+                  attemptController?.signal.aborted ||
+                  !Number.isFinite(progressEvent.loaded) ||
+                  progressEvent.loaded <= lastProgressLoaded
+                ) {
+                  return;
+                }
+                lastProgressLoaded = progressEvent.loaded;
+                armPhaseTimeout('read', readTimeoutMs);
+              },
+            }
+          : {}),
+      });
+      if (phaseTimeoutError) {
+        requestFailed = true;
+        requestError = phaseTimeoutError;
+        response = undefined;
+      }
+    } catch (error) {
+      requestFailed = true;
+      requestError = phaseTimeoutError ?? (signal?.aborted ? createAbortError() : error);
+    } finally {
+      attemptSettled = true;
+      clearPhaseTimeout();
+      signal?.removeEventListener('abort', handleParentAbort);
+    }
+
+    assertWithinOverallDeadline();
+
+    if (requestFailed) {
+      if (attempt >= maxRetries || !isRetryableRequestError(requestError)) {
+        throw requestError;
+      }
+      await waitForRetry(retryDelayMs, attempt, signal);
+      assertWithinOverallDeadline();
+      return request(attempt + 1, signal);
     }
-    if (type === 'binary') {
+
+    if (!response) {
+      throw new Error(`httpRequest completed without a response: ${url}`);
+    }
+
+    if (+response.status === 200) {
       return response.data;
     }
-    return response.data;
+
+    if (RETRYABLE_HTTP_STATUSES.has(Number(response.status)) && attempt < maxRetries) {
+      await waitForRetry(retryDelayMs, attempt, signal);
+      assertWithinOverallDeadline();
+      return request(attempt + 1, signal);
+    }
+
+    throw new Error(`httpRequest error: ${url} ${response.statusText}`);
+  };
+
+  if (!overallTimeoutMs) {
+    return request(0);
+  }
+
+  const controller = new AbortController();
+  const requestPromise = request(0, controller.signal);
+  let timeoutTimer: ReturnType<typeof setTimeout> | undefined;
+  try {
+    return await new Promise<T>((resolve, reject) => {
+      timeoutTimer = setTimeout(() => {
+        reject(overallTimeoutError);
+        controller.abort();
+      }, overallTimeoutMs);
+      requestPromise.then(resolve, reject);
+    });
+  } finally {
+    if (timeoutTimer) {
+      clearTimeout(timeoutTimer);
+    }
   }
-  throw new Error(`httpRequest error: ${url} ${response.statusText}`);
 };

package/src/utils/pro2Wallpaper.ts

@@ -1,5 +1,8 @@
 import { ERRORS, HardwareErrorCode } from '@onekeyfe/hd-shared';
 
+// RGB565 pixel packing and dithering index calculation require bitwise operations.
+/* eslint-disable no-bitwise */
+
 export const PRO2_WALLPAPER_WIDTH = 604;
 export const PRO2_WALLPAPER_HEIGHT = 1024;
 
@@ -9,19 +12,16 @@ const COLOR_FORMAT_RGB565 = 0x12;
 const COLOR_FORMAT_RGB565A8 = 0x14;
 
 const RED_THRESHOLD = [
-  1, 7, 3, 5, 0, 8, 2, 6, 7, 1, 5, 3, 8, 0, 6, 2, 3, 5, 0, 8, 2, 6, 1, 7, 5, 3, 8,
-  0, 6, 2, 7, 1, 0, 8, 2, 6, 1, 7, 3, 5, 8, 0, 6, 2, 7, 1, 5, 3, 2, 6, 1, 7, 3, 5, 0,
-  8, 6, 2, 7, 1, 5, 3, 8, 0,
+  1, 7, 3, 5, 0, 8, 2, 6, 7, 1, 5, 3, 8, 0, 6, 2, 3, 5, 0, 8, 2, 6, 1, 7, 5, 3, 8, 0, 6, 2, 7, 1, 0,
+  8, 2, 6, 1, 7, 3, 5, 8, 0, 6, 2, 7, 1, 5, 3, 2, 6, 1, 7, 3, 5, 0, 8, 6, 2, 7, 1, 5, 3, 8, 0,
 ];
 const GREEN_THRESHOLD = [
-  1, 3, 2, 2, 3, 1, 2, 2, 2, 2, 0, 4, 2, 2, 4, 0, 3, 1, 2, 2, 1, 3, 2, 2, 2, 2, 4,
-  0, 2, 2, 0, 4, 1, 3, 2, 2, 3, 1, 2, 2, 2, 2, 0, 4, 2, 2, 4, 0, 3, 1, 2, 2, 1, 3, 2,
-  2, 2, 2, 4, 0, 2, 2, 0, 4,
+  1, 3, 2, 2, 3, 1, 2, 2, 2, 2, 0, 4, 2, 2, 4, 0, 3, 1, 2, 2, 1, 3, 2, 2, 2, 2, 4, 0, 2, 2, 0, 4, 1,
+  3, 2, 2, 3, 1, 2, 2, 2, 2, 0, 4, 2, 2, 4, 0, 3, 1, 2, 2, 1, 3, 2, 2, 2, 2, 4, 0, 2, 2, 0, 4,
 ];
 const BLUE_THRESHOLD = [
-  5, 3, 8, 0, 6, 2, 7, 1, 3, 5, 0, 8, 2, 6, 1, 7, 8, 0, 6, 2, 7, 1, 5, 3, 0, 8, 2,
-  6, 1, 7, 3, 5, 6, 2, 7, 1, 5, 3, 8, 0, 2, 6, 1, 7, 3, 5, 0, 8, 7, 1, 5, 3, 8, 0, 6,
-  2, 1, 7, 3, 5, 0, 8, 2, 6,
+  5, 3, 8, 0, 6, 2, 7, 1, 3, 5, 0, 8, 2, 6, 1, 7, 8, 0, 6, 2, 7, 1, 5, 3, 0, 8, 2, 6, 1, 7, 3, 5, 6,
+  2, 7, 1, 5, 3, 8, 0, 2, 6, 1, 7, 3, 5, 0, 8, 7, 1, 5, 3, 8, 0, 6, 2, 1, 7, 3, 5, 0, 8, 2, 6,
 ];
 
 function invalidParameter(message: string): Error {
@@ -86,10 +86,8 @@ export function encodePro2Wallpaper(options: {
       const sourceOffset = (y * width + x) * 4;
       const thresholdIndex = ((y & 7) << 3) + (x & 7);
       let red = Math.min(rgba[sourceOffset] + RED_THRESHOLD[thresholdIndex], 0xff) & 0xf8;
-      let green =
-        Math.min(rgba[sourceOffset + 1] + GREEN_THRESHOLD[thresholdIndex], 0xff) & 0xfc;
-      let blue =
-        Math.min(rgba[sourceOffset + 2] + BLUE_THRESHOLD[thresholdIndex], 0xff) & 0xf8;
+      let green = Math.min(rgba[sourceOffset + 1] + GREEN_THRESHOLD[thresholdIndex], 0xff) & 0xfc;
+      let blue = Math.min(rgba[sourceOffset + 2] + BLUE_THRESHOLD[thresholdIndex], 0xff) & 0xf8;
       if (!hasTransparency) {
         const alpha = rgba[sourceOffset + 3];
         red = (red * alpha) >> 8;

package/src/utils/tracing.ts

@@ -164,8 +164,8 @@ export function completeRequestContext(responseID: number, error?: Error): void
     context.status = error ? 'error' : 'success';
     if (error) {
       context.error = error.message;
-      // 方法错误已经通过标准 API 响应返回给调用方。请求追踪属于调试信息，
-      // 不应再以 console.error 级别制造第二份面向用户的错误输出。
+      // Method errors already reach callers through the standard API response.
+      // Request tracing is diagnostic and must not emit a second user-facing error.
       Log.debug(
         `[RequestContext] [completeRequestContext] Error: ${formatRequestContext(context)}`
       );

package/dist/api/internal.d.ts

@@ -1,4 +0,0 @@
-export { default as deviceInfoGet } from './protocol-v2/DeviceInfoGet';
-export { default as deviceStatusGet } from './protocol-v2/DeviceStatusGet';
-export { default as deviceSettingsGet } from './protocol-v2/DeviceSettingsGet';
-//# sourceMappingURL=internal.d.ts.map

package/dist/api/internal.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"internal.d.ts","sourceRoot":"","sources":["../../src/api/internal.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,OAAO,IAAI,aAAa,EAAE,MAAM,6BAA6B,CAAC;AACvE,OAAO,EAAE,OAAO,IAAI,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAC3E,OAAO,EAAE,OAAO,IAAI,iBAAiB,EAAE,MAAM,iCAAiC,CAAC"}

package/dist/api/protocol-v2/DeviceSessionOpen.d.ts

@@ -1,28 +0,0 @@
-import { BaseMethod } from '../BaseMethod';
-import type { DeviceAttachPinOnDevice, DeviceHostPassphrase, DevicePassphraseOnDevice, DeviceSessionResume } from '@onekeyfe/hd-transport';
-type HiddenWalletSelection = {
-    host_passphrase: DeviceHostPassphrase;
-    passphrase_on_device?: never;
-    attach_pin_on_device?: never;
-} | {
-    host_passphrase?: never;
-    passphrase_on_device: DevicePassphraseOnDevice;
-    attach_pin_on_device?: never;
-} | {
-    host_passphrase?: never;
-    passphrase_on_device?: never;
-    attach_pin_on_device: DeviceAttachPinOnDevice;
-};
-export type DeviceSessionOpenParams = {
-    resume: DeviceSessionResume;
-    select?: never;
-} | {
-    resume?: never;
-    select: HiddenWalletSelection;
-};
-export default class DeviceSessionOpen extends BaseMethod<DeviceSessionOpenParams> {
-    init(): void;
-    run(): Promise<import("@onekeyfe/hd-transport").DeviceSession>;
-}
-export {};
-//# sourceMappingURL=DeviceSessionOpen.d.ts.map

package/dist/api/protocol-v2/DeviceSessionOpen.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"DeviceSessionOpen.d.ts","sourceRoot":"","sources":["../../../src/api/protocol-v2/DeviceSessionOpen.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAG3C,OAAO,KAAK,EACV,uBAAuB,EACvB,oBAAoB,EACpB,wBAAwB,EACxB,mBAAmB,EACpB,MAAM,wBAAwB,CAAC;AAEhC,KAAK,qBAAqB,GACtB;IACE,eAAe,EAAE,oBAAoB,CAAC;IACtC,oBAAoB,CAAC,EAAE,KAAK,CAAC;IAC7B,oBAAoB,CAAC,EAAE,KAAK,CAAC;CAC9B,GACD;IACE,eAAe,CAAC,EAAE,KAAK,CAAC;IACxB,oBAAoB,EAAE,wBAAwB,CAAC;IAC/C,oBAAoB,CAAC,EAAE,KAAK,CAAC;CAC9B,GACD;IACE,eAAe,CAAC,EAAE,KAAK,CAAC;IACxB,oBAAoB,CAAC,EAAE,KAAK,CAAC;IAC7B,oBAAoB,EAAE,uBAAuB,CAAC;CAC/C,CAAC;AAEN,MAAM,MAAM,uBAAuB,GAC/B;IAAE,MAAM,EAAE,mBAAmB,CAAC;IAAC,MAAM,CAAC,EAAE,KAAK,CAAA;CAAE,GAC/C;IAAE,MAAM,CAAC,EAAE,KAAK,CAAC;IAAC,MAAM,EAAE,qBAAqB,CAAA;CAAE,CAAC;AAsDtD,MAAM,CAAC,OAAO,OAAO,iBAAkB,SAAQ,UAAU,CAAC,uBAAuB,CAAC;IAChF,IAAI;IAOE,GAAG;CAQV"}

package/src/api/internal.ts

@@ -1,9 +0,0 @@
-/**
- * SDK 内部原生命令注册表。
- *
- * 这些方法允许开发工具通过低层 `call` 调试 Protocol V2，但不会进入
- * `CoreApi` 或公开的便捷方法集合；业务接入仍应使用统一 DeviceState API。
- */
-export { default as deviceInfoGet } from './protocol-v2/DeviceInfoGet';
-export { default as deviceStatusGet } from './protocol-v2/DeviceStatusGet';
-export { default as deviceSettingsGet } from './protocol-v2/DeviceSettingsGet';

package/src/api/protocol-v2/DeviceSessionOpen.ts

@@ -1,100 +0,0 @@
-import { BaseMethod } from '../BaseMethod';
-import { invalidParameter } from '../helpers/filesystemValidation';
-
-import type {
-  DeviceAttachPinOnDevice,
-  DeviceHostPassphrase,
-  DevicePassphraseOnDevice,
-  DeviceSessionResume,
-} from '@onekeyfe/hd-transport';
-
-type HiddenWalletSelection =
-  | {
-      host_passphrase: DeviceHostPassphrase;
-      passphrase_on_device?: never;
-      attach_pin_on_device?: never;
-    }
-  | {
-      host_passphrase?: never;
-      passphrase_on_device: DevicePassphraseOnDevice;
-      attach_pin_on_device?: never;
-    }
-  | {
-      host_passphrase?: never;
-      passphrase_on_device?: never;
-      attach_pin_on_device: DeviceAttachPinOnDevice;
-    };
-
-export type DeviceSessionOpenParams =
-  | { resume: DeviceSessionResume; select?: never }
-  | { resume?: never; select: HiddenWalletSelection };
-
-const isRecord = (value: unknown): value is Record<string, unknown> =>
-  !!value && typeof value === 'object' && !Array.isArray(value);
-
-const normalizeParams = (payload: Record<string, unknown>): DeviceSessionOpenParams => {
-  const hasResume = payload.resume !== undefined;
-  const hasSelect = payload.select !== undefined;
-  if (hasResume === hasSelect) {
-    throw invalidParameter('DeviceSessionOpen requires exactly one of [resume] or [select].');
-  }
-
-  if (hasResume) {
-    if (!isRecord(payload.resume) || typeof payload.resume.session_id !== 'string') {
-      throw invalidParameter('Parameter [resume.session_id] must be a non-empty string.');
-    }
-    const sessionId = payload.resume.session_id.trim();
-    if (!sessionId) {
-      throw invalidParameter('Parameter [resume.session_id] must be a non-empty string.');
-    }
-    return { resume: { session_id: sessionId } };
-  }
-
-  if (!isRecord(payload.select)) {
-    throw invalidParameter('Parameter [select] must be a hidden-wallet selection object.');
-  }
-  const { select } = payload;
-  const accessKeys = ['host_passphrase', 'passphrase_on_device', 'attach_pin_on_device'] as const;
-  const selected = accessKeys.filter(key => select[key] !== undefined);
-  const unknown = Object.keys(select).filter(
-    key => !accessKeys.includes(key as (typeof accessKeys)[number])
-  );
-  if (unknown.length > 0 || selected.length !== 1) {
-    throw invalidParameter('Parameter [select] requires exactly one hidden-wallet access mode.');
-  }
-
-  if (selected[0] === 'host_passphrase') {
-    const host = select.host_passphrase;
-    if (!isRecord(host) || typeof host.passphrase !== 'string') {
-      throw invalidParameter('Parameter [select.host_passphrase.passphrase] is required.');
-    }
-    const passphrase = host.passphrase.normalize('NFKD');
-    if (!passphrase || passphrase.includes('\0') || passphrase.length > 50) {
-      throw invalidParameter('Parameter [select.host_passphrase.passphrase] is invalid.');
-    }
-    return { select: { host_passphrase: { passphrase } } };
-  }
-
-  if (selected[0] === 'passphrase_on_device') {
-    return { select: { passphrase_on_device: {} } };
-  }
-  return { select: { attach_pin_on_device: {} } };
-};
-
-export default class DeviceSessionOpen extends BaseMethod<DeviceSessionOpenParams> {
-  init() {
-    this.requireProtocolV2 = true;
-    this.useDevicePassphraseState = false;
-    this.skipForceUpdateCheck = true;
-    this.params = normalizeParams(this.payload as unknown as Record<string, unknown>);
-  }
-
-  async run() {
-    const { message } = await this.device.commands.typedCall(
-      'DeviceSessionOpen',
-      'DeviceSession',
-      this.params
-    );
-    return message;
-  }
-}