@jolibox/implement 1.1.4-beta.8 → 1.1.4

package/src/native/api/get-system-info.ts

@@ -13,10 +13,13 @@ const getSystemInfoSync = createSyncAPI(API_GET_SYSTEM_SYNC, {
     const { data } = res;
     return {
       system: data.deviceInfo.system,
-      platform: data.platform,
+      platform: data.deviceInfo.platform,
       version: data.sdkInfo.jssdkVersion,
       pixelRatio: data.deviceInfo.pixelRatio,
-      language: data.deviceInfo.lang
+      language: data.deviceInfo.lang,
+      brand: data.deviceInfo.brand,
+      appName: data.hostInfo?.appName,
+      SDKVersion: data.sdkInfo.jssdkVersion
     };
   }
 });

package/src/native/api/keyboard.ts

@@ -1,16 +1,16 @@
 import { createCommands } from '@jolibox/common';
-import { applyNative } from '../bootstrap/bridge';
-import { createAPI, registerCanIUse, t } from './base';
+import { invokeNative } from '../bootstrap/bridge';
+import { createSyncAPI, registerCanIUse, t } from './base';
 
-export const showKeyboard = createAPI('showKeyboard', {
+export const showKeyboard = createSyncAPI('showKeyboard', {
   paramsSchema: t.tuple(
     t.object({
-      defaultValue: t.string().default(''),
-      multiple: t.boolean().default(false),
+      defaultValue: t.string().optional().default(''),
+      multiple: t.boolean().optional().default(false),
       maxLength: t.unknown().optional().default(100000)
     })
   ),
-  async implement(params) {
+  implement(params) {
     const maxLength = Math.floor(Number(params.maxLength) ?? 100000);
     let { defaultValue } = params;
 
@@ -18,7 +18,7 @@ export const showKeyboard = createAPI('showKeyboard', {
       defaultValue = defaultValue.slice(0, maxLength);
     }
 
-    applyNative('showKeyboardSync', { ...params, defaultValue, maxLength });
+    invokeNative('showKeyboardSync', { ...params, defaultValue, maxLength });
   }
 });
 
@@ -38,14 +38,14 @@ registerCanIUse('keyboard.showKeyboard', {
   }
 });
 
-export const updateKeyboard = createAPI('updateKeyboard', {
+export const updateKeyboard = createSyncAPI('updateKeyboard', {
   paramsSchema: t.tuple(
     t.object({
       value: t.string()
     })
   ),
-  async implement(params) {
-    applyNative('updateKeyboardSync', params);
+  implement(params) {
+    invokeNative('updateKeyboardSync', params);
   }
 });
 
@@ -58,9 +58,9 @@ registerCanIUse('keyboard.updateKeyboard', {
   }
 });
 
-export const hideKeyboard = createAPI('hideKeyboard', {
-  async implement() {
-    applyNative('hideKeyboardSync');
+export const hideKeyboard = createSyncAPI('hideKeyboard', {
+  implement() {
+    invokeNative('hideKeyboardSync');
   }
 });
 

package/src/native/bootstrap/index.ts

@@ -1,6 +1,5 @@
 import { onNative, RuntimeLoader } from './bridge';
 import { joliboxJSCore } from '../js-core';
-import { HostUserInfo } from '@/common/context/types';
 import { context } from '@/common/context';
 import { hostEmitter } from '@jolibox/common';
 import { taskTracker, track } from '../report';

package/src/native/network/index.ts

@@ -5,11 +5,18 @@ import { context } from '@/common/context';
 /**
  * inner fetch
  */
+const defaultHeaders: Record<string, string> = {
+  'x-user-agent': xUserAgent()
+};
+if (context.hostUserInfo?.token) {
+  defaultHeaders['x-joli-token'] = context.hostUserInfo.token;
+}
+if (context.joliSource) {
+  defaultHeaders['x-joli-source'] = context.joliSource;
+}
+
 export const innerFetch = createFetch('createRequestTaskSync', 'operateRequestTaskSync', {
   type: 'inner',
   baseUrl: context.testMode ? 'https://stg-api.jolibox.com' : 'https://api.jolibox.com',
-  defaultHeaders: {
-    'x-user-agent': xUserAgent(),
-    'X-JOLI-TOKEN': context.hostUserInfo?.token ?? ''
-  }
+  defaultHeaders
 });

package/src/native/report/index.ts

@@ -1,7 +1,7 @@
 import './errors';
-import { createCommands, isObject, isString, EventEmitter } from '@jolibox/common';
+import { createCommands, isObject, isString, EventEmitter, EProject } from '@jolibox/common';
 export * from '../../common/report/types';
-import { createTracks, EProject, ReportHandler } from '@/common/report';
+import { createTracks, ReportHandler } from '@/common/report';
 import { context } from '@/common/context';
 import { NativeTaskTracker } from './task-tracker';
 import { invokeNative } from '../bootstrap/bridge';

package/src/native/types/native-method-map.d.ts

@@ -237,6 +237,17 @@ declare global {
           realNameAuthenticationStatus?: 'uncertified' | 'certified';
         };
       }>;
+
+      getNetworkStatusSync: () => {
+        /** 错误消息 */
+        errMsg: string;
+        /** 错误码 */
+        errNo?: number;
+        data: {
+          isConnected: boolean;
+          networkType: 'wifi' | '4g' | '5g' | '3g' | '2g' | 'unknown';
+        };
+      };
     }
 
     interface NativeEventMap {

package/dist/common/report/errors/error-types.d.ts

@@ -1,122 +0,0 @@
-type InternalLifeCycleErrorName = 'INTERNAL_GAME_LAUNCH_ERROR';
-type InternalAPIErrorName = 'INTERNAL_API_ERROR';
-type InternalMetricErrorName = 'INTERNAL_METRIC_REPORT_ERROR';
-type InternalReporterErrorName = 'INTERNAL_REPORTER_ERROR';
-type InternalUtilErrorName = 'INTERNAL_BUFFER_ERROR' | 'INTERNAL_SCHEMA_PARSE_ERROR';
-type InternalInjectErrorName = 'INTERNAL_CONTEXT_ERROR' | 'INTERNAL_JSCORE_ERROR';
-type InternalBridgeErrorName = 'INTERNAL_INVOKE_NATIVE_ERROR' | 'INTERNAL_APPLY_NATIVE_ERROR' | 'INTERNAL_INVOKE_METHOD_ERROR';
-type UserErrorName = 'USER_VALIDATE_ERROR' | 'USER_GLOBAL_ERROR' | 'USER_FETCH_ERROR' | 'API_ERROR' | 'USER_CUSTOM_ERROR';
-export type ErrorName = InternalLifeCycleErrorName | InternalInjectErrorName | InternalAPIErrorName | InternalBridgeErrorName | InternalUtilErrorName | InternalReporterErrorName | UserErrorName | InternalMetricErrorName;
-export type ErrorKind = 'INTERNAL_ERROR' | 'USER_ERROR' | 'API_ERROR';
-export type ErrorEnv = 'native' | 'h5';
-export type LoadScriptError = BaseError & {
-    code?: number;
-};
-export declare enum LoadScriptCode {
-    DEVELOPER_FILE_NOT_FOUND = 0,
-    INTERNAL_IOS_CAN_NOT_FOUND_PKG = 1,
-    USER_IOS_LOAD_TIMEOUT = 2,
-    INTERNAL_IOS_PKG_LOAD_ERROR = 3,
-    INTERNAL_IOS_PKG_PARSE_FAIL = 4,
-    USER_IOS_GET_EMPTY_DATA = 5,
-    USER_ANDROID_GET_PKG_FAIL = 6,
-    DEVELOPER_ANDROID_PACKAGE_FILE_UNEXPECTED_REQUIRE = 7
-}
-export declare abstract class BaseError extends Error {
-    abstract kind: ErrorKind;
-    abstract name: ErrorName;
-    priority: 'P0' | 'P1';
-    env?: ErrorEnv;
-    raw?: Error;
-    component?: string;
-    constructor(error: string | Error);
-}
-export declare abstract class InternalError extends BaseError {
-    readonly kind = "INTERNAL_ERROR";
-}
-export declare abstract class UserError extends BaseError {
-    readonly kind = "USER_ERROR";
-}
-export declare class UserValidateError extends UserError {
-    readonly name = "USER_VALIDATE_ERROR";
-}
-export declare class UserGlobalError extends UserError {
-    readonly name = "USER_GLOBAL_ERROR";
-    readonly priority = "P0";
-}
-export declare class UserCustomError extends UserError {
-    readonly message: string;
-    readonly errNo?: number | undefined;
-    readonly name = "USER_CUSTOM_ERROR";
-    errMsg: string;
-    extra?: {
-        [key: string]: unknown;
-    };
-    constructor(message: string, errNo?: number | undefined, extra?: {
-        [key: string]: unknown;
-    });
-}
-export declare class UserFetchError extends UserError {
-    readonly message: string;
-    readonly errNo?: number | undefined;
-    readonly name = "USER_FETCH_ERROR";
-    errMsg: string;
-    extra?: {
-        [key: string]: unknown;
-    };
-    constructor(message: string, errNo?: number | undefined, extra?: {
-        [key: string]: unknown;
-    });
-}
-export declare class InternalSchemaParseError extends InternalError {
-    readonly name = "INTERNAL_SCHEMA_PARSE_ERROR";
-    readonly priority = "P0";
-}
-export declare class InternalInvokeNativeError extends InternalError {
-    readonly name = "INTERNAL_INVOKE_NATIVE_ERROR";
-}
-export declare class InternalApplyNativeError extends InternalError {
-    readonly errNo?: number | undefined;
-    readonly name = "INTERNAL_APPLY_NATIVE_ERROR";
-    errorType?: string;
-    errorCode?: number;
-    constructor(message: string, errNo?: number | undefined, errorType?: string, errorCode?: number);
-}
-export declare class InternalInvokeMethodError extends InternalError {
-    readonly name = "INTERNAL_INVOKE_METHOD_ERROR";
-}
-export declare class InternalJSCoreNotFoundError extends InternalError {
-    readonly name = "INTERNAL_JSCORE_ERROR";
-}
-export declare class InternalBufferError extends InternalError {
-    readonly name = "INTERNAL_BUFFER_ERROR";
-}
-export declare class InternalContextError extends InternalError {
-    readonly message: string;
-    readonly name = "INTERNAL_CONTEXT_ERROR";
-    readonly property: string;
-    constructor(message: string, property: string);
-}
-export declare class APIError extends BaseError {
-    readonly message: string;
-    readonly code: number;
-    readonly kind = "API_ERROR";
-    readonly name = "API_ERROR";
-    extra?: Record<string, unknown>;
-    errorType?: string;
-    constructor(message: string, code: number, errorType?: string, stack?: string, priority?: 'P0' | 'P1');
-    toJSON(): {
-        message: string;
-        stack: string | undefined;
-        name: string;
-        code: number;
-        errorType: string | undefined;
-    };
-}
-export declare class InternalMetricReportError extends InternalError {
-    readonly name = "INTERNAL_METRIC_REPORT_ERROR";
-}
-export declare class InternalReporterError extends InternalError {
-    readonly name = "INTERNAL_REPORTER_ERROR";
-}
-export {};

package/src/common/report/errors/error-types.ts

@@ -1,206 +0,0 @@
-type InternalLifeCycleErrorName = 'INTERNAL_GAME_LAUNCH_ERROR';
-
-// API
-type InternalAPIErrorName = 'INTERNAL_API_ERROR';
-
-// 前端埋点
-type InternalMetricErrorName = 'INTERNAL_METRIC_REPORT_ERROR';
-
-// reporter
-type InternalReporterErrorName = 'INTERNAL_REPORTER_ERROR';
-
-// 内部错误
-type InternalUtilErrorName = 'INTERNAL_BUFFER_ERROR' | 'INTERNAL_SCHEMA_PARSE_ERROR';
-
-// Native Inject Error
-type InternalInjectErrorName = 'INTERNAL_CONTEXT_ERROR' | 'INTERNAL_JSCORE_ERROR';
-
-type InternalBridgeErrorName =
-  | 'INTERNAL_INVOKE_NATIVE_ERROR'
-  | 'INTERNAL_APPLY_NATIVE_ERROR'
-  | 'INTERNAL_INVOKE_METHOD_ERROR';
-
-// User
-type UserErrorName =
-  | 'USER_VALIDATE_ERROR'
-  | 'USER_GLOBAL_ERROR'
-  | 'USER_FETCH_ERROR'
-  | 'API_ERROR'
-  | 'USER_CUSTOM_ERROR';
-
-export type ErrorName =
-  | InternalLifeCycleErrorName
-  | InternalInjectErrorName
-  | InternalAPIErrorName
-  | InternalBridgeErrorName
-  | InternalUtilErrorName
-  | InternalReporterErrorName
-  | UserErrorName
-  | InternalMetricErrorName;
-
-export type ErrorKind = 'INTERNAL_ERROR' | 'USER_ERROR' | 'API_ERROR';
-export type ErrorEnv = 'native' | 'h5';
-export type LoadScriptError = BaseError & { code?: number };
-export enum LoadScriptCode {
-  DEVELOPER_FILE_NOT_FOUND = 0,
-  INTERNAL_IOS_CAN_NOT_FOUND_PKG = 1,
-  USER_IOS_LOAD_TIMEOUT = 2,
-  INTERNAL_IOS_PKG_LOAD_ERROR = 3,
-  INTERNAL_IOS_PKG_PARSE_FAIL = 4,
-  USER_IOS_GET_EMPTY_DATA = 5,
-  USER_ANDROID_GET_PKG_FAIL = 6,
-  DEVELOPER_ANDROID_PACKAGE_FILE_UNEXPECTED_REQUIRE = 7
-}
-
-export abstract class BaseError extends Error {
-  abstract kind: ErrorKind;
-  abstract name: ErrorName;
-  priority: 'P0' | 'P1';
-  env?: ErrorEnv;
-  raw?: Error;
-  component?: string;
-  constructor(error: string | Error) {
-    if (typeof error === 'string') {
-      super(error);
-      this.priority = 'P1';
-      return;
-    }
-    super(error.message);
-    this.priority = 'P1';
-    this.stack = error.stack;
-    this.raw = error;
-  }
-}
-
-export abstract class InternalError extends BaseError {
-  readonly kind = 'INTERNAL_ERROR';
-}
-export abstract class UserError extends BaseError {
-  readonly kind = 'USER_ERROR';
-}
-
-export class UserValidateError extends UserError {
-  readonly name = 'USER_VALIDATE_ERROR';
-}
-
-export class UserGlobalError extends UserError {
-  readonly name = 'USER_GLOBAL_ERROR';
-  readonly priority = 'P0';
-}
-
-export class UserCustomError extends UserError {
-  readonly name = 'USER_CUSTOM_ERROR';
-  errMsg: string;
-  extra?: { [key: string]: unknown };
-
-  constructor(readonly message: string, readonly errNo?: number, extra?: { [key: string]: unknown }) {
-    super(message);
-    this.errMsg = message;
-
-    if (extra) {
-      this.extra = Object.assign({}, this.extra, extra);
-    }
-  }
-}
-
-export class UserFetchError extends UserError {
-  readonly name = 'USER_FETCH_ERROR';
-  errMsg: string;
-  extra?: { [key: string]: unknown };
-
-  constructor(readonly message: string, readonly errNo?: number, extra?: { [key: string]: unknown }) {
-    super(message);
-    this.errMsg = message;
-
-    if (extra) {
-      this.extra = Object.assign({}, this.extra, extra);
-    }
-  }
-}
-
-export class InternalSchemaParseError extends InternalError {
-  readonly name = 'INTERNAL_SCHEMA_PARSE_ERROR';
-  readonly priority = 'P0';
-}
-
-export class InternalInvokeNativeError extends InternalError {
-  readonly name = 'INTERNAL_INVOKE_NATIVE_ERROR';
-}
-
-export class InternalApplyNativeError extends InternalError {
-  readonly name = 'INTERNAL_APPLY_NATIVE_ERROR';
-  errorType?: string;
-  errorCode?: number;
-  constructor(message: string, readonly errNo?: number, errorType?: string, errorCode?: number) {
-    super(message);
-    this.errorType = errorType;
-    this.errorCode = errorCode;
-  }
-}
-
-export class InternalInvokeMethodError extends InternalError {
-  readonly name = 'INTERNAL_INVOKE_METHOD_ERROR';
-}
-
-export class InternalJSCoreNotFoundError extends InternalError {
-  readonly name = 'INTERNAL_JSCORE_ERROR';
-}
-
-export class InternalBufferError extends InternalError {
-  readonly name = 'INTERNAL_BUFFER_ERROR';
-}
-
-export class InternalContextError extends InternalError {
-  readonly name = 'INTERNAL_CONTEXT_ERROR';
-  readonly property: string;
-  constructor(readonly message: string, property: string) {
-    super(message);
-    this.property = property;
-  }
-}
-
-export class APIError extends BaseError {
-  readonly kind = 'API_ERROR';
-  readonly name = 'API_ERROR';
-  extra?: Record<string, unknown>;
-  errorType?: string;
-
-  constructor(
-    readonly message: string,
-    readonly code: number,
-    errorType?: string,
-    stack?: string,
-    priority?: 'P0' | 'P1'
-  ) {
-    super(message);
-
-    if (errorType) {
-      this.errorType = errorType;
-    }
-
-    if (stack !== undefined) {
-      this.stack = stack;
-    }
-    if (priority) {
-      this.priority = priority;
-    }
-  }
-
-  toJSON() {
-    return {
-      message: this.message,
-      stack: this.stack,
-      name: this.name,
-      code: this.code,
-      errorType: this.errorType
-    };
-  }
-}
-
-export class InternalMetricReportError extends InternalError {
-  readonly name = 'INTERNAL_METRIC_REPORT_ERROR';
-}
-
-export class InternalReporterError extends InternalError {
-  readonly name = 'INTERNAL_REPORTER_ERROR';
-}

package/src/h5/http/utils/__tests__/uuid.test.ts

@@ -1,16 +0,0 @@
-// import { expect, test } from "vitest";
-import { isValidUUIDV4, uuidv4 } from '../../../../common/http/uuid';
-
-describe('uuid', () => {
-  it('test uuid', () => {
-    const uuid = uuidv4();
-    expect(uuid.length).toBe(36);
-    expect(isValidUUIDV4(uuid)).toBe(true);
-  });
-
-  it('isValidUUIDV4', () => {
-    const randomUUIDV4 = '5b1e0b7b-3b3b-4b4b-8b8b-9b9b0b1b2b3b';
-    expect(isValidUUIDV4(randomUUIDV4)).toBe(true);
-    expect(isValidUUIDV4('')).toBe(false);
-  });
-});