@jolibox/implement 1.1.4-beta.12 → 1.1.4-beta.14

package/src/common/report/task-track/index.ts

@@ -30,7 +30,7 @@ export abstract class TaskTracker {
 
   abstract reporter(point: TaskPoint): void;
   abstract tracker(point: TrackEvent, info: Record<string, unknown> | null): void;
-  constructor(eventEmitter: EventEmitter<{ visible: [boolean] }>, interval?: number) {
+  constructor(readonly eventEmitter: EventEmitter<{ visible: [boolean] }>, interval?: number) {
     this.interval = interval ?? 5 * 1000;
 
     eventEmitter.on('visible', (visible) => {
@@ -63,14 +63,16 @@ export abstract class TaskTracker {
   }
 
   private createRAFTimer(callback: (duration: number) => void) {
-    let lastTime = performance.now();
+    let lastTime = Date.now();
     let rafId: number;
+    let intervalId: number;
     let isRunning = false;
     let totalTime = 0;
 
-    const tick = (currentTime: number) => {
+    const tick = () => {
       if (!isRunning) return;
 
+      const currentTime = Date.now();
       const deltaTime = currentTime - lastTime;
       if (deltaTime >= this.interval) {
         if (this.visible) {
@@ -83,19 +85,66 @@ export abstract class TaskTracker {
       rafId = requestAnimationFrame(tick);
     };
 
+    const startInterval = () => {
+      stopRAF();
+      lastTime = Date.now();
+      intervalId = window.setInterval(() => {
+        if (!isRunning) return;
+        const currentTime = Date.now();
+        const deltaTime = currentTime - lastTime;
+        if (deltaTime >= this.interval) {
+          lastTime = currentTime;
+        }
+      }, this.interval) as unknown as number;
+    };
+
+    const startRAF = () => {
+      stopInterval();
+      lastTime = Date.now();
+      rafId = requestAnimationFrame(tick);
+    };
+
+    const stopRAF = () => {
+      if (rafId) {
+        cancelAnimationFrame(rafId);
+        rafId = 0;
+      }
+    };
+
+    const stopInterval = () => {
+      if (intervalId) {
+        clearInterval(intervalId);
+        intervalId = 0;
+      }
+    };
+
+    this.eventEmitter.on('visible', (visible) => {
+      if (!isRunning) return;
+
+      console.log('visible', visible);
+      if (visible) {
+        startRAF();
+      } else {
+        startInterval();
+      }
+    });
+
+    const originVisible = this.visible;
     return {
       start() {
         if (!isRunning) {
           isRunning = true;
-          lastTime = performance.now();
-          rafId = requestAnimationFrame(tick);
+          if (originVisible) {
+            startRAF();
+          } else {
+            startInterval();
+          }
         }
       },
       stop() {
         isRunning = false;
-        if (rafId) {
-          cancelAnimationFrame(rafId);
-        }
+        stopRAF();
+        stopInterval();
       }
     };
   }

package/src/h5/api/ads.ts

@@ -0,0 +1,24 @@
+import { JoliboxAdsImpl } from '@/common/ads';
+import { track } from '../report';
+import { tracker as h5Tracker } from '../report/event-tracker';
+import { createCommands } from '@jolibox/common';
+import JoliboxHttpClient from '../http';
+
+const commands = createCommands();
+const ads = new JoliboxAdsImpl(track, new JoliboxHttpClient(), () => h5Tracker.networkIsOk);
+
+commands.registerCommand('AdsSDK.init', (config) => {
+  ads.init(config);
+});
+
+commands.registerCommand('AdsSDK.adConfig', (params) => {
+  ads.adConfig(params);
+});
+
+commands.registerCommand('AdsSDK.adBreak', (params) => {
+  ads.adBreak(params);
+});
+
+commands.registerCommand('AdsSDK.adUnit', (params) => {
+  ads.adUnit(params);
+});

package/src/h5/api/index.ts

@@ -2,3 +2,4 @@ import './get-system-info';
 import './lifecycle';
 import './storage';
 import './task';
+import './ads';

package/src/h5/report/index.ts

@@ -32,6 +32,7 @@ const { track, trackPerformance } = createTracks((...args) => {
     mp_id: (_data.mp_id as string) ?? '',
     mp_version: (_data.mp_version as string) ?? ''
   };
+  //TODO: 根据上报重要性做聚合
   const eventBody: IEvent = {
     name: data.tag,
     type: EventType.System,

package/src/index.ts

@@ -3,7 +3,6 @@
 import './h5/report';
 //global apis
 import './h5/api';
-import './h5/ads';
 import { config } from './h5/bootstrap';
 
 config();

package/src/native/api/ads.ts

@@ -3,27 +3,47 @@ import { createSyncAPI, registerCanIUse } from './base';
 
 const commands = createCommands();
 
+import { IAdsInitParams, JoliboxAdsImpl, IAdConfigParams, IAdBreakParams, IAdUnitParams } from '@/common/ads';
+import { track } from '../report';
+
+import { innerFetch as fetch } from '../network';
+
+// TODO: 从network中获取isOK
+const ads = new JoliboxAdsImpl(
+  track,
+  {
+    get: <T>(url: string, options?: any) =>
+      fetch<T>(url, {
+        method: 'GET',
+        responseType: 'json',
+        appendHostCookie: true,
+        ...options
+      }).then((res) => res.response.data as T)
+  },
+  () => true
+);
+
 const adInit = createSyncAPI('adInit', {
-  implement: (config) => {
-    logger.log('[JoliboxAdsSDK] adInit', config);
+  implement: (config?: IAdsInitParams) => {
+    ads.init(config);
   }
 });
 
 const adConfig = createSyncAPI('adConfig', {
-  implement: (params) => {
-    logger.log('[JoliboxAdsSDK] adConfig', params);
+  implement: (params: IAdConfigParams) => {
+    ads.adConfig(params);
   }
 });
 
 const adBreak = createSyncAPI('adBreak', {
-  implement: (params) => {
-    logger.log('[JoliboxAdsSDK] adBreak', params);
+  implement: (params: IAdBreakParams) => {
+    ads.adBreak(params);
   }
 });
 
 const adUnit = createSyncAPI('adUnit', {
-  implement: (params) => {
-    logger.log('[JoliboxAdsSDK] adUnit', params);
+  implement: (params: IAdUnitParams) => {
+    ads.adUnit(params);
   }
 });
 

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';
-}