@ad-execute-manager/core 2.0.1 → 2.0.3

package/README.md

@@ -1,367 +1,367 @@
-# @ad-execute-manager/core
-
-Core functionality for ad execution management including AdExecuteManager, utility functions, and middleware composition.
-
-## Installation
-
-```bash
-npm install @ad-execute-manager/core
-```
-
-## Features
-
-- **AdExecuteManager**: A powerful ad execution management class for handling reward-based ads, interstitial ads, and other advertising formats
-- **compose**: A middleware composition utility inspired by Koa
-- **needRetryAdError**: A utility function for determining if an ad error should be retried
-
-## Usage
-
-### AdExecuteManager
-
-```javascript
-import { AdExecuteManager } from '@ad-execute-manager/core';
-
-const adManager = new AdExecuteManager({
-  // Configuration options
-});
-
-// Initialize ad
-const result = await adManager.init();
-
-// Show ad
-const showResult = await adManager.show();
-```
-
-### Middleware Composition
-
-```javascript
-import { compose } from '@ad-execute-manager/core';
-
-const middlewares = [
-  async (ctx, next) => {
-    console.log('Middleware 1 start');
-    await next();
-    console.log('Middleware 1 end');
-  },
-  async (ctx, next) => {
-    console.log('Middleware 2 start');
-    await next();
-    console.log('Middleware 2 end');
-  }
-];
-
-const composedMiddleware = compose(middlewares);
-await composedMiddleware({});
-```
-
-### Error Retry Utility
-
-```javascript
-import { needRetryAdError } from '@ad-execute-manager/core';
-
-const apiError = {
-  errMsg: 'ad_show_timeout: normal',
-  timeout: 5000
-};
-
-const shouldRetry = needRetryAdError({
-  apiError,
-  configuredAdTimeout: 5000,
-  errorRetryStrategy: {
-    timeout: true,
-    background: true
-  }
-});
-
-console.log('Should retry:', shouldRetry);
-```
-
-## Examples
-
-### 实际应用场景示例
-
-#### 1. 完整的广告执行流程
-
-```javascript
-import { AdExecuteManager } from '@ad-execute-manager/core';
-
-// 创建广告执行管理器实例
-const adManager = new AdExecuteManager({
-  log: true,
-  enableVisibilityListener: true,
-  maxRetryCount: 2,
-  errorRetryStrategy: {
-    timeout: true,
-    background: true
-  }
-});
-
-// 假设我们有一个广告实例类
-class MyRewardAd {
-  constructor() {
-    this._adTimeoutTime = 5000;
-  }
-
-  initialize(options) {
-    console.log('Initializing ad with options:', options);
-    return this;
-  }
-
-  async ad(ctx, next) {
-    const { options, collection, recovered } = ctx;
-    console.log('Showing ad with options:', options);
-    console.log('Recovered info:', recovered);
-
-    try {
-      // 模拟广告加载和显示
-      await new Promise(resolve => setTimeout(resolve, 1000));
-      
-      // 模拟广告成功
-      if (collection && collection.onSuccess) {
-        collection.onSuccess();
-      }
-      
-      await next({ success: true });
-      return { success: true };
-    } catch (error) {
-      // 模拟广告失败
-      if (collection && collection.onFail) {
-        collection.onFail(error);
-      }
-      
-      await next({ success: false, error });
-      return { success: false, error };
-    }
-  }
-
-  clear() {
-    console.log('Clearing ad resources');
-  }
-
-  record(info) {
-    console.log('Recording ad info:', info);
-  }
-}
-
-// 创建广告实例
-const rewardAd = new MyRewardAd();
-
-// 添加广告任务
-const result = await adManager.addTask(rewardAd, {
-  options: {
-    adUnitId: 'your-ad-unit-id',
-    userId: 'user123'
-  },
-  collection: {
-    onSuccess: () => console.log('Ad success callback'),
-    onFail: (error) => console.log('Ad fail callback:', error),
-    onCancel: () => console.log('Ad cancel callback')
-  }
-});
-
-console.log('Ad execution result:', result);
-
-// 等待所有任务完成
-await adManager.whenAllTasksComplete();
-console.log('All tasks completed');
-```
-
-#### 2. 自定义中间件组合
-
-```javascript
-import { compose } from '@ad-execute-manager/core';
-
-// 定义中间件
-const middleware1 = async (ctx, next) => {
-  console.log('Middleware 1 start');
-  ctx.value1 = 'value1';
-  await next();
-  console.log('Middleware 1 end');
-};
-
-const middleware2 = async (ctx, next) => {
-  console.log('Middleware 2 start');
-  console.log('Received value1:', ctx.value1);
-  ctx.value2 = 'value2';
-  await next();
-  console.log('Middleware 2 end');
-};
-
-const middleware3 = async (ctx, next) => {
-  console.log('Middleware 3 start');
-  console.log('Received value1:', ctx.value1);
-  console.log('Received value2:', ctx.value2);
-  ctx.value3 = 'value3';
-  await next();
-  console.log('Middleware 3 end');
-};
-
-// 组合中间件
-const composedMiddleware = compose([middleware1, middleware2, middleware3]);
-
-// 执行组合后的中间件
-const ctx = { initialValue: 'initial' };
-await composedMiddleware(ctx);
-
-console.log('Final ctx:', ctx);
-```
-
-#### 3. 错误处理和重试策略
-
-```javascript
-import { needRetryAdError } from '@ad-execute-manager/core';
-
-// 模拟不同类型的错误
-const timeoutError = {
-  errMsg: 'ad_show_timeout: normal',
-  timeout: 5000
-};
-
-const backgroundError = {
-  errMsg: 'app in background is not support show ad'
-};
-
-const otherError = {
-  errMsg: 'ad_load_fail: network error'
-};
-
-// 配置重试策略
-const retryStrategy = {
-  timeout: true,
-  background: true
-};
-
-// 检查各种错误是否需要重试
-const shouldRetryTimeout = needRetryAdError({
-  apiError: timeoutError,
-  configuredAdTimeout: 5000,
-  errorRetryStrategy: retryStrategy
-});
-
-const shouldRetryBackground = needRetryAdError({
-  apiError: backgroundError,
-  configuredAdTimeout: 5000,
-  errorRetryStrategy: retryStrategy
-});
-
-const shouldRetryOther = needRetryAdError({
-  apiError: otherError,
-  configuredAdTimeout: 5000,
-  errorRetryStrategy: retryStrategy
-});
-
-console.log('Should retry timeout error:', shouldRetryTimeout);
-console.log('Should retry background error:', shouldRetryBackground);
-console.log('Should retry other error:', shouldRetryOther);
-```
-
-## API
-
-### AdExecuteManager
-
-The main class for managing ad execution with support for initialization, showing, and error handling.
-
-#### Constructor
-
-```javascript
-new AdExecuteManager(args)
-```
-
-- **args** (Object): 构造函数参数
-  - **options** (Object, optional): 广告执行选项
-  - **log** (Boolean, optional): 是否打印日志
-  - **enableVisibilityListener** (Boolean, optional): 是否启用前后台监听
-  - **maxRetryCount** (Number, optional): 最大重试次数，默认为 1，0 表示不重试
-  - **errorRetryStrategy** (Object, optional): 错误重试策略
-    - **timeout** (Boolean, optional): 是否重试超时错误
-    - **background** (Boolean, optional): 是否重试后台错误
-
-#### Methods
-
-- **initialize(_args)**: 初始化 AdExecuteManager 实例
-  - **_args** (Any): 初始化参数
-  - 返回: AdExecuteManager 实例
-
-- **addTask(adInstance, ctx)**: 添加广告任务
-  - **adInstance** (Object): RewardAdFather 的子类实例
-  - **ctx** (Object): 广告执行上下文
-    - **options** (Object): 广告执行选项
-    - **collection** (Object): 回调集合
-  - 返回: Promise，广告执行结果的 Promise
-
-- **clearTasks()**: 清空任务栈并取消所有任务
-
-- **getTaskCount()**: 获取当前未完成的任务总数
-  - 返回: Number，未完成的任务数量
-
-- **isRunning()**: 是否有任务正在运行
-  - 返回: Boolean
-
-- **getCurrentTaskId()**: 获取当前执行的任务 ID
-  - 返回: String|null，当前任务 ID
-
-- **whenAllTasksComplete()**: 返回一个 Promise，当任务队列中的所有任务都完成时 resolve
-  - 返回: Promise<void>
-
-- **enableVisibilityListener()**: 启用前后台监听
-
-- **disableVisibilityListener()**: 禁用前后台监听
-
-- **isVisibilityListenerEnabled()**: 获取前后台监听器状态
-  - 返回: Boolean，是否启用
-
-- **destroyVisibilityListener()**: 销毁前后台监听器
-
-- **static getInstance(args)**: 获取单例实例
-  - **args** (Object, optional): 构造函数参数
-  - 返回: AdExecuteManager 实例
-
-- **static build(args)**: 获取单例实例
-  - **args** (Object, optional): 构造函数参数
-  - 返回: AdExecuteManager 实例
-
-- **static new(args)**: 创建新实例
-  - **args** (Object, optional): 构造函数参数
-  - 返回: AdExecuteManager 实例
-
-- **static getSafeInstance()**: 获取单例实例，如果不存在则返回 null
-  - 返回: AdExecuteManager|null
-
-### compose
-
-```typescript
-function compose(middlewares: Array<(ctx: any, next: () => Promise<void>) => Promise<void>>): (ctx: any) => Promise<void>
-```
-
-- **middlewares** (Array<Function>): KOA 中间件数组，每个中间件函数接收 ctx 和 next 参数
-- 返回: Function，返回一个组合后的中间件函数，接收 ctx 参数并按顺序执行所有中间件
-
-### needRetryAdError
-
-```typescript
-function needRetryAdError({
-  apiError,
-  configuredAdTimeout,
-  errorRetryStrategy
-}: {
-  apiError: { errMsg?: string; timeout?: number };
-  configuredAdTimeout: number;
-  errorRetryStrategy?: {
-    timeout?: boolean;
-    background?: boolean;
-  };
-}): boolean
-```
-
-- **apiError** (Object): 广告错误信息
-  - **errMsg** (String, optional): 错误信息
-  - **timeout** (Number, optional): 超时时间
-- **configuredAdTimeout** (Number): 配置的广告超时时间
-- **errorRetryStrategy** (Object, optional): 错误重试策略
-  - **timeout** (Boolean, optional): 是否重试超时错误
-  - **background** (Boolean, optional): 是否重试后台错误
-- 返回: Boolean，是否需要重试
-
-## License
-
-MIT
+# @ad-execute-manager/core
+
+Core functionality for ad execution management including AdExecuteManager, utility functions, and middleware composition.
+
+## Installation
+
+```bash
+npm install @ad-execute-manager/core
+```
+
+## Features
+
+- **AdExecuteManager**: A powerful ad execution management class for handling reward-based ads, interstitial ads, and other advertising formats
+- **compose**: A middleware composition utility inspired by Koa
+- **needRetryAdError**: A utility function for determining if an ad error should be retried
+
+## Usage
+
+### AdExecuteManager
+
+```javascript
+import { AdExecuteManager } from '@ad-execute-manager/core';
+
+const adManager = new AdExecuteManager({
+  // Configuration options
+});
+
+// Initialize ad
+const result = await adManager.init();
+
+// Show ad
+const showResult = await adManager.show();
+```
+
+### Middleware Composition
+
+```javascript
+import { compose } from '@ad-execute-manager/core';
+
+const middlewares = [
+  async (ctx, next) => {
+    console.log('Middleware 1 start');
+    await next();
+    console.log('Middleware 1 end');
+  },
+  async (ctx, next) => {
+    console.log('Middleware 2 start');
+    await next();
+    console.log('Middleware 2 end');
+  }
+];
+
+const composedMiddleware = compose(middlewares);
+await composedMiddleware({});
+```
+
+### Error Retry Utility
+
+```javascript
+import { needRetryAdError } from '@ad-execute-manager/core';
+
+const apiError = {
+  errMsg: 'ad_show_timeout: normal',
+  timeout: 5000
+};
+
+const shouldRetry = needRetryAdError({
+  apiError,
+  configuredAdTimeout: 5000,
+  errorRetryStrategy: {
+    timeout: true,
+    background: true
+  }
+});
+
+console.log('Should retry:', shouldRetry);
+```
+
+## Examples
+
+### 实际应用场景示例
+
+#### 1. 完整的广告执行流程
+
+```javascript
+import { AdExecuteManager } from '@ad-execute-manager/core';
+
+// 创建广告执行管理器实例
+const adManager = new AdExecuteManager({
+  log: true,
+  enableVisibilityListener: true,
+  maxRetryCount: 2,
+  errorRetryStrategy: {
+    timeout: true,
+    background: true
+  }
+});
+
+// 假设我们有一个广告实例类
+class MyRewardAd {
+  constructor() {
+    this._adTimeoutTime = 5000;
+  }
+
+  initialize(options) {
+    console.log('Initializing ad with options:', options);
+    return this;
+  }
+
+  async ad(ctx, next) {
+    const { options, collection, recovered } = ctx;
+    console.log('Showing ad with options:', options);
+    console.log('Recovered info:', recovered);
+
+    try {
+      // 模拟广告加载和显示
+      await new Promise(resolve => setTimeout(resolve, 1000));
+      
+      // 模拟广告成功
+      if (collection && collection.onSuccess) {
+        collection.onSuccess();
+      }
+      
+      await next({ success: true });
+      return { success: true };
+    } catch (error) {
+      // 模拟广告失败
+      if (collection && collection.onFail) {
+        collection.onFail(error);
+      }
+      
+      await next({ success: false, error });
+      return { success: false, error };
+    }
+  }
+
+  clear() {
+    console.log('Clearing ad resources');
+  }
+
+  record(info) {
+    console.log('Recording ad info:', info);
+  }
+}
+
+// 创建广告实例
+const rewardAd = new MyRewardAd();
+
+// 添加广告任务
+const result = await adManager.addTask(rewardAd, {
+  options: {
+    adUnitId: 'your-ad-unit-id',
+    userId: 'user123'
+  },
+  collection: {
+    onSuccess: () => console.log('Ad success callback'),
+    onFail: (error) => console.log('Ad fail callback:', error),
+    onCancel: () => console.log('Ad cancel callback')
+  }
+});
+
+console.log('Ad execution result:', result);
+
+// 等待所有任务完成
+await adManager.whenAllTasksComplete();
+console.log('All tasks completed');
+```
+
+#### 2. 自定义中间件组合
+
+```javascript
+import { compose } from '@ad-execute-manager/core';
+
+// 定义中间件
+const middleware1 = async (ctx, next) => {
+  console.log('Middleware 1 start');
+  ctx.value1 = 'value1';
+  await next();
+  console.log('Middleware 1 end');
+};
+
+const middleware2 = async (ctx, next) => {
+  console.log('Middleware 2 start');
+  console.log('Received value1:', ctx.value1);
+  ctx.value2 = 'value2';
+  await next();
+  console.log('Middleware 2 end');
+};
+
+const middleware3 = async (ctx, next) => {
+  console.log('Middleware 3 start');
+  console.log('Received value1:', ctx.value1);
+  console.log('Received value2:', ctx.value2);
+  ctx.value3 = 'value3';
+  await next();
+  console.log('Middleware 3 end');
+};
+
+// 组合中间件
+const composedMiddleware = compose([middleware1, middleware2, middleware3]);
+
+// 执行组合后的中间件
+const ctx = { initialValue: 'initial' };
+await composedMiddleware(ctx);
+
+console.log('Final ctx:', ctx);
+```
+
+#### 3. 错误处理和重试策略
+
+```javascript
+import { needRetryAdError } from '@ad-execute-manager/core';
+
+// 模拟不同类型的错误
+const timeoutError = {
+  errMsg: 'ad_show_timeout: normal',
+  timeout: 5000
+};
+
+const backgroundError = {
+  errMsg: 'app in background is not support show ad'
+};
+
+const otherError = {
+  errMsg: 'ad_load_fail: network error'
+};
+
+// 配置重试策略
+const retryStrategy = {
+  timeout: true,
+  background: true
+};
+
+// 检查各种错误是否需要重试
+const shouldRetryTimeout = needRetryAdError({
+  apiError: timeoutError,
+  configuredAdTimeout: 5000,
+  errorRetryStrategy: retryStrategy
+});
+
+const shouldRetryBackground = needRetryAdError({
+  apiError: backgroundError,
+  configuredAdTimeout: 5000,
+  errorRetryStrategy: retryStrategy
+});
+
+const shouldRetryOther = needRetryAdError({
+  apiError: otherError,
+  configuredAdTimeout: 5000,
+  errorRetryStrategy: retryStrategy
+});
+
+console.log('Should retry timeout error:', shouldRetryTimeout);
+console.log('Should retry background error:', shouldRetryBackground);
+console.log('Should retry other error:', shouldRetryOther);
+```
+
+## API
+
+### AdExecuteManager
+
+The main class for managing ad execution with support for initialization, showing, and error handling.
+
+#### Constructor
+
+```javascript
+new AdExecuteManager(args)
+```
+
+- **args** (Object): 构造函数参数
+  - **options** (Object, optional): 广告执行选项
+  - **log** (Boolean, optional): 是否打印日志
+  - **enableVisibilityListener** (Boolean, optional): 是否启用前后台监听
+  - **maxRetryCount** (Number, optional): 最大重试次数，默认为 1，0 表示不重试
+  - **errorRetryStrategy** (Object, optional): 错误重试策略
+    - **timeout** (Boolean, optional): 是否重试超时错误
+    - **background** (Boolean, optional): 是否重试后台错误
+
+#### Methods
+
+- **initialize(_args)**: 初始化 AdExecuteManager 实例
+  - **_args** (Any): 初始化参数
+  - 返回: AdExecuteManager 实例
+
+- **addTask(adInstance, ctx)**: 添加广告任务
+  - **adInstance** (Object): RewardAdFather 的子类实例
+  - **ctx** (Object): 广告执行上下文
+    - **options** (Object): 广告执行选项
+    - **collection** (Object): 回调集合
+  - 返回: Promise，广告执行结果的 Promise
+
+- **clearTasks()**: 清空任务栈并取消所有任务
+
+- **getTaskCount()**: 获取当前未完成的任务总数
+  - 返回: Number，未完成的任务数量
+
+- **isRunning()**: 是否有任务正在运行
+  - 返回: Boolean
+
+- **getCurrentTaskId()**: 获取当前执行的任务 ID
+  - 返回: String|null，当前任务 ID
+
+- **whenAllTasksComplete()**: 返回一个 Promise，当任务队列中的所有任务都完成时 resolve
+  - 返回: Promise<void>
+
+- **enableVisibilityListener()**: 启用前后台监听
+
+- **disableVisibilityListener()**: 禁用前后台监听
+
+- **isVisibilityListenerEnabled()**: 获取前后台监听器状态
+  - 返回: Boolean，是否启用
+
+- **destroyVisibilityListener()**: 销毁前后台监听器
+
+- **static getInstance(args)**: 获取单例实例
+  - **args** (Object, optional): 构造函数参数
+  - 返回: AdExecuteManager 实例
+
+- **static build(args)**: 获取单例实例
+  - **args** (Object, optional): 构造函数参数
+  - 返回: AdExecuteManager 实例
+
+- **static new(args)**: 创建新实例
+  - **args** (Object, optional): 构造函数参数
+  - 返回: AdExecuteManager 实例
+
+- **static getSafeInstance()**: 获取单例实例，如果不存在则返回 null
+  - 返回: AdExecuteManager|null
+
+### compose
+
+```typescript
+function compose(middlewares: Array<(ctx: any, next: () => Promise<void>) => Promise<void>>): (ctx: any) => Promise<void>
+```
+
+- **middlewares** (Array<Function>): KOA 中间件数组，每个中间件函数接收 ctx 和 next 参数
+- 返回: Function，返回一个组合后的中间件函数，接收 ctx 参数并按顺序执行所有中间件
+
+### needRetryAdError
+
+```typescript
+function needRetryAdError({
+  apiError,
+  configuredAdTimeout,
+  errorRetryStrategy
+}: {
+  apiError: { errMsg?: string; timeout?: number };
+  configuredAdTimeout: number;
+  errorRetryStrategy?: {
+    timeout?: boolean;
+    background?: boolean;
+  };
+}): boolean
+```
+
+- **apiError** (Object): 广告错误信息
+  - **errMsg** (String, optional): 错误信息
+  - **timeout** (Number, optional): 超时时间
+- **configuredAdTimeout** (Number): 配置的广告超时时间
+- **errorRetryStrategy** (Object, optional): 错误重试策略
+  - **timeout** (Boolean, optional): 是否重试超时错误
+  - **background** (Boolean, optional): 是否重试后台错误
+- 返回: Boolean，是否需要重试
+
+## License
+
+MIT

package/dist/AdExecuteManager.d.ts

@@ -90,6 +90,20 @@ export type IConstructArgs = {
      */
     errorRetryStrategy?: ErrorRetryStrategy;
 };
+export type ITaskResult = {
+    /**
+     * 广告任务的唯一标识符
+     */
+    id: string;
+    /**
+     * 广告错误信息
+     */
+    apiError?: import("./typings/ad.js").IApiError;
+    /**
+     * 广告任务后台恢复前台时预估重试次数的原因
+     */
+    recovered?: import("./typings/ad.js").RecoveredInfo;
+};
 declare class AdExecuteManager {
     /**
      * 单例实例
@@ -212,12 +226,14 @@ declare class AdExecuteManager {
      * @param {Object} ctx 广告执行上下文
      * @param {IRewordAdConfig} ctx.options 广告执行选项
      * @param {CallbackCollection} ctx.collection 回调集合
-     * @returns {Promise} 广告执行结果的Promise
+     * @returns {Promise.<ITaskResult & {[key: string]: any}> | Undefined>} 广告执行结果的Promise
      */
     addTask(adInstance: IAdInstance, ctx: {
         options: IRewordAdConfig;
         collection: CallbackCollection;
-    }): Promise<any>;
+    }): Promise<ITaskResult & {
+        [key: string]: any;
+    }> | undefined;
     /**
      * 组合所有任务
      * @private
@@ -249,4 +265,4 @@ declare class AdExecuteManager {
      */
     whenAllTasksComplete(): Promise<void>;
 }
-import { Logger } from '@ad-execute-manager/helper';
+import { Logger } from '@ad-execute-manager/logger';

package/dist/index.cjs

@@ -1 +1 @@
-"use strict";const __rslib_import_meta_url__="u"<typeof document?new(require("url".replace("",""))).URL("file:"+__filename).href:document.currentScript&&document.currentScript.src||new URL("main.js",document.baseURI).href;var __webpack_require__={};__webpack_require__.d=(e,t)=>{for(var r in t)__webpack_require__.o(t,r)&&!__webpack_require__.o(e,r)&&Object.defineProperty(e,r,{enumerable:!0,get:t[r]})},__webpack_require__.o=(e,t)=>Object.prototype.hasOwnProperty.call(e,t),__webpack_require__.r=e=>{"u">typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})};var __webpack_exports__={};__webpack_require__.r(__webpack_exports__),__webpack_require__.d(__webpack_exports__,{AdExecuteManager:()=>src_AdExecuteManager});const helper_namespaceObject=require("@ad-execute-manager/helper");function isTimeoutError(e,t){return(null==e?void 0:e.errMsg)&&"string"==typeof e.errMsg&&e.errMsg.startsWith("ad_show_timeout: normal")&&(null==e?void 0:e.timeout)==t}function isBackgroundError(e){return(null==e?void 0:e.errMsg)&&"string"==typeof e.errMsg&&(e.errMsg.startsWith("app in background is not support show ad")||e.errMsg.startsWith("other controller is presented"))}function needRetryAdError({apiError:e,configuredAdTimeout:t,errorRetryStrategy:r}){return!!((null==r?void 0:r.timeout)&&isTimeoutError(e,t)||(null==r?void 0:r.background)&&isBackgroundError(e))}const compose=e=>e.map(e=>(t,r)=>async i=>await e(Object.assign({},t,i),r)).reduce((e,t)=>(r,i)=>e(r,t(r,i))),src_compose=compose;class AdExecuteManager{static _instance=null;_taskStack=[];_currentBatchTasks=[];_isRunning=!1;_currentTask=null;_isForeground=!0;_appShowListener=null;_appHideListener=null;_enableVisibilityListener=!1;_maxRetryCount=1;_retryQueue=[];_errorRetryStrategy={timeout:!0,background:!0};constructor(e){this.logger=new helper_namespaceObject.Logger({prefix:"AdExecuteManager",enabled:!!(null==e?void 0:e.log)}),(null==e?void 0:e.errorRetryStrategy)&&(this._errorRetryStrategy=Object.assign({},this._errorRetryStrategy,null==e?void 0:e.errorRetryStrategy)),this._enableVisibilityListener=null==e?void 0:e.enableVisibilityListener,this._maxRetryCount=(null==e?void 0:e.maxRetryCount)??1,this._enableVisibilityListener&&this._initVisibilityListener()}initialize(e){return this}static getInstance(e){return AdExecuteManager._instance||(AdExecuteManager._instance=new AdExecuteManager(e)),AdExecuteManager._instance}static build(e){return AdExecuteManager._instance||(AdExecuteManager._instance=new AdExecuteManager(e)),AdExecuteManager._instance}static new(e){return new AdExecuteManager(e)}static getSafeInstance(){return AdExecuteManager._instance?AdExecuteManager._instance:(this.logger.error("AdExecuteManager实例不存在"),null)}_initVisibilityListener(){!("u"<typeof tt)&&tt.onAppShow&&tt.onAppHide?(this._appShowListener=()=>{this._isForeground=!0,this._handleAppShow()},this._appHideListener=()=>{this._isForeground=!1,this._handleAppHide()},tt.onAppShow(this._appShowListener),tt.onAppHide(this._appHideListener),this.logger.info("前后台监听器已初始化")):this.logger.warn("tt API不可用，无法监听前后台状态")}_handleAppHide(){if(this._isRunning&&this._currentBatchTasks.length>0){let e=this._currentBatchTasks.filter(e=>{var t;return e.id!==(null==(t=this._currentTask)?void 0:t.id)&&!e._isResolved&&!e._isRejected});e.length>0&&(this.logger.info(`将 ${e.length} 个未执行的任务放回任务栈,任务ID: ${e.map(e=>e.id).join(",")}`),this._taskStack=[...e,...this._taskStack],this._currentBatchTasks=this._currentBatchTasks.filter(t=>!e.some(e=>e.id===t.id)))}}_handleAppShow(){this._retryQueue.length>0&&(this.logger.info(`应用进入前台:优先执行重试队列，任务数: ${this._retryQueue.length}, 任务ID: ${this._retryQueue.map(e=>e.id).join(",")}`),this._taskStack=[...this._retryQueue,...this._taskStack],this._retryQueue=[]),this._taskStack.length>0&&!this._isRunning&&(this.logger.info(`应用进入前台:恢复待执行任务数: ${this._taskStack.length}, 任务ID: ${this._taskStack.map(e=>e.id).join(",")}`),this._compose())}destroyVisibilityListener(){this._appShowListener&&"u">typeof tt&&tt.offAppShow&&(tt.offAppShow(this._appShowListener),this._appShowListener=null),this._appHideListener&&"u">typeof tt&&tt.offAppHide&&(tt.offAppHide(this._appHideListener),this._appHideListener=null),this.logger.info("前后台监听器已销毁")}enableVisibilityListener(){this._enableVisibilityListener||(this._enableVisibilityListener=!0,this._initVisibilityListener()),this.logger.info("前后台监听器已启用")}disableVisibilityListener(){this._enableVisibilityListener&&(this._enableVisibilityListener=!1,this.destroyVisibilityListener()),this.logger.info("前后台监听器已禁用")}isVisibilityListenerEnabled(){return this._enableVisibilityListener}addTask(e,t){return e&&"function"==typeof e.ad?new Promise((r,i)=>{let s={adInstance:e,options:t.options??{},callbackCollection:t.collection??{},resolve:r,reject:i,id:`ad_${Date.now()}_${Math.random().toString(36).substr(2,9)}`,_isResolved:!1,_isRejected:!1,_retryCount:0,_retryMsg:"ok"};this._taskStack.push(s),this._isRunning||this._compose()}):(this.logger.error("无效的广告实例 请正确实现.ad方法"),Promise.reject(Error("无效的广告实例")))}_compose(){if(0===this._taskStack.length){this._isRunning=!1,this._currentTask=null;return}if(!this._isForeground){this.logger.info(`应用处于后台,暂停任务执行,任务ID: ${this._taskStack.map(e=>e.id).join(",")}`),this._isRunning=!1;return}this._isRunning=!0;let e=[...this._taskStack];this._taskStack=[],this._currentBatchTasks=e;let t=e.map(e=>async(t,r)=>{let{adInstance:i,options:s,callbackCollection:n,resolve:a,id:o,_retryCount:c,_retryMsg:l}=e,_={count:c,retry:c>0,message:l};if(e._isResolved||e._isRejected)return void await r(t);this._currentTask=e;try{let c=async e=>{await r(Object.assign({},t,e))},l=await i.initialize(s).ad({options:s,collection:n,recovered:_},c),h=Object.assign({id:o,recovered:_},l);if(this.logger.info(`任务执行成功，成功信息：${JSON.stringify(h)}`),needRetryAdError({apiError:null==h?void 0:h.apiError,configuredAdTimeout:i._adTimeoutTime,errorRetryStrategy:this._errorRetryStrategy})&&!this._isForeground&&e._retryCount<this._maxRetryCount){var u;e._retryCount++,e._retryMsg=(null==h||null==(u=h.apiError)?void 0:u.errMsg)||"unknown";let t=`任务 ${o} 在后台失败，加入重试队列 (即将第 ${e._retryCount} 次重试, 最大重试次数 ${this._maxRetryCount}, 重试原因: ${e._retryMsg})`;this.logger.warn(t),h.recovered.retry=!0,h.recovered.count=e._retryCount,h.recovered.message=e._retryMsg,e._isResolved=!1,e._isRejected=!1,this._retryQueue.push(e)}else e._isResolved=!0;a(h),null==i||i.record(h)}catch(n){let s=Object.assign({id:o,apiError:n,recovered:_});this.logger.error(`任务执行失败, 继续下一个任务,错误信息：${JSON.stringify(s)}`),e._isRejected=!0;try{null==i||i.clear()}catch(e){this.logger.error("clear error: ",JSON.stringify(Object.assign({id:o,apiError:e})))}a(s),null==i||i.record(s),await r(t)}}),r={roundTasks:t.length};compose(t)(r,async e=>{this.logger.info("本轮活动队列已经清空",e),this._taskStack.length>0?Promise.resolve().then(()=>{this._compose()}):(this._isRunning=!1,this._currentTask=null,this._currentBatchTasks=[])})()}clearTasks(){if(this._currentTask){if(this._currentTask._isResolved||this._currentTask._isRejected){this._currentTask=null;return}try{this._currentTask.callbackCollection&&this._currentTask.callbackCollection.onCancel&&this._currentTask.callbackCollection.onCancel(),this._currentTask._isResolved=!0,this._currentTask.resolve()}catch(e){this.logger.error("clear current task error: ",e)}this._currentTask=null}this._currentBatchTasks.length>0&&(this._currentBatchTasks.forEach(e=>{if(e!==this._currentTask&&!e._isResolved&&!e._isRejected)try{e.callbackCollection&&e.callbackCollection.onCancel&&e.callbackCollection.onCancel(),e._isResolved=!0,e.resolve()}catch(e){this.logger.error("clear current batch task error: ",e)}}),this._currentBatchTasks=[]),this._taskStack.forEach(e=>{if(!e._isResolved&&!e._isRejected&&(e._isResolved=!0,e.resolve(),e.callbackCollection&&e.callbackCollection.onCancel))try{e.callbackCollection.onCancel()}catch(e){this.logger.error("clear task error: ",e)}}),this._retryQueue.forEach(e=>{if(!e._isResolved&&!e._isRejected&&(e._isResolved=!0,e.resolve(),e.callbackCollection&&e.callbackCollection.onCancel))try{e.callbackCollection.onCancel()}catch(e){this.logger.error("clear retry task error: ",e)}}),this._taskStack=[],this._retryQueue=[],this._isRunning=!1}getTaskCount(){return this._taskStack.filter(e=>!e._isResolved&&!e._isRejected).length+this._currentBatchTasks.filter(e=>e!==this._currentTask&&!e._isResolved&&!e._isRejected).length+(!this._currentTask||this._currentTask._isResolved||this._currentTask._isRejected?0:1)+this._retryQueue.filter(e=>!e._isResolved&&!e._isRejected).length}isRunning(){return this._isRunning}getCurrentTaskId(){var e;return(null==(e=this._currentTask)?void 0:e.id)||null}whenAllTasksComplete(){return new Promise(e=>{let t=null,r=()=>{let i=0===this._taskStack.length,s=!this._isRunning,n=null===this._currentTask,a=0===this._currentBatchTasks.length||this._currentBatchTasks.every(e=>e._isResolved||e._isRejected),o=0===this._retryQueue.length;i&&s&&n&&a&&o?(t&&clearTimeout(t),e()):t=setTimeout(r,500)};r()})}}const src_AdExecuteManager=AdExecuteManager;for(var __rspack_i in exports.AdExecuteManager=__webpack_exports__.AdExecuteManager,__webpack_exports__)-1===["AdExecuteManager"].indexOf(__rspack_i)&&(exports[__rspack_i]=__webpack_exports__[__rspack_i]);Object.defineProperty(exports,"__esModule",{value:!0});
+"use strict";const __rslib_import_meta_url__="u"<typeof document?new(require("url".replace("",""))).URL("file:"+__filename).href:document.currentScript&&document.currentScript.src||new URL("main.js",document.baseURI).href;var __webpack_require__={};__webpack_require__.d=(e,t)=>{for(var r in t)__webpack_require__.o(t,r)&&!__webpack_require__.o(e,r)&&Object.defineProperty(e,r,{enumerable:!0,get:t[r]})},__webpack_require__.o=(e,t)=>Object.prototype.hasOwnProperty.call(e,t),__webpack_require__.r=e=>{"u">typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})};var __webpack_exports__={};__webpack_require__.r(__webpack_exports__),__webpack_require__.d(__webpack_exports__,{AdExecuteManager:()=>src_AdExecuteManager});const logger_namespaceObject=require("@ad-execute-manager/logger");function isTimeoutError(e,t){return(null==e?void 0:e.errMsg)&&"string"==typeof e.errMsg&&e.errMsg.startsWith("ad_show_timeout: normal")&&(null==e?void 0:e.timeout)==t}function isBackgroundError(e){return(null==e?void 0:e.errMsg)&&"string"==typeof e.errMsg&&(e.errMsg.startsWith("app in background is not support show ad")||e.errMsg.startsWith("other controller is presented"))}function needRetryAdError({apiError:e,configuredAdTimeout:t,errorRetryStrategy:r}){return!!((null==r?void 0:r.timeout)&&isTimeoutError(e,t)||(null==r?void 0:r.background)&&isBackgroundError(e))}const compose=e=>e.map(e=>(t,r)=>async i=>await e(Object.assign({},t,i),r)).reduce((e,t)=>(r,i)=>e(r,t(r,i))),src_compose=compose;class AdExecuteManager{static _instance=null;_taskStack=[];_currentBatchTasks=[];_isRunning=!1;_currentTask=null;_isForeground=!0;_appShowListener=null;_appHideListener=null;_enableVisibilityListener=!1;_maxRetryCount=1;_retryQueue=[];_errorRetryStrategy={timeout:!0,background:!0};constructor(e){this.logger=new logger_namespaceObject.Logger({prefix:"AdExecuteManager",enabled:!!(null==e?void 0:e.log)}),(null==e?void 0:e.errorRetryStrategy)&&(this._errorRetryStrategy=Object.assign({},this._errorRetryStrategy,null==e?void 0:e.errorRetryStrategy)),this._enableVisibilityListener=null==e?void 0:e.enableVisibilityListener,this._maxRetryCount=(null==e?void 0:e.maxRetryCount)??1,this._enableVisibilityListener&&this._initVisibilityListener()}initialize(e){return this}static getInstance(e){return AdExecuteManager._instance||(AdExecuteManager._instance=new AdExecuteManager(e)),AdExecuteManager._instance}static build(e){return AdExecuteManager._instance||(AdExecuteManager._instance=new AdExecuteManager(e)),AdExecuteManager._instance}static new(e){return new AdExecuteManager(e)}static getSafeInstance(){return AdExecuteManager._instance?AdExecuteManager._instance:(this.logger.error("AdExecuteManager实例不存在"),null)}_initVisibilityListener(){!("u"<typeof tt)&&tt.onAppShow&&tt.onAppHide?(this._appShowListener=()=>{this._isForeground=!0,this._handleAppShow()},this._appHideListener=()=>{this._isForeground=!1,this._handleAppHide()},tt.onAppShow(this._appShowListener),tt.onAppHide(this._appHideListener),this.logger.info("前后台监听器已初始化")):this.logger.warn("tt API不可用，无法监听前后台状态")}_handleAppHide(){if(this._isRunning&&this._currentBatchTasks.length>0){let e=this._currentBatchTasks.filter(e=>{var t;return e.id!==(null==(t=this._currentTask)?void 0:t.id)&&!e._isResolved&&!e._isRejected});e.length>0&&(this.logger.info(`将 ${e.length} 个未执行的任务放回任务栈,任务ID: ${e.map(e=>e.id).join(",")}`),this._taskStack=[...e,...this._taskStack],this._currentBatchTasks=this._currentBatchTasks.filter(t=>!e.some(e=>e.id===t.id)))}}_handleAppShow(){this._retryQueue.length>0&&(this.logger.info(`应用进入前台:优先执行重试队列，任务数: ${this._retryQueue.length}, 任务ID: ${this._retryQueue.map(e=>e.id).join(",")}`),this._taskStack=[...this._retryQueue,...this._taskStack],this._retryQueue=[]),this._taskStack.length>0&&!this._isRunning&&(this.logger.info(`应用进入前台:恢复待执行任务数: ${this._taskStack.length}, 任务ID: ${this._taskStack.map(e=>e.id).join(",")}`),this._compose())}destroyVisibilityListener(){this._appShowListener&&"u">typeof tt&&tt.offAppShow&&(tt.offAppShow(this._appShowListener),this._appShowListener=null),this._appHideListener&&"u">typeof tt&&tt.offAppHide&&(tt.offAppHide(this._appHideListener),this._appHideListener=null),this.logger.info("前后台监听器已销毁")}enableVisibilityListener(){this._enableVisibilityListener||(this._enableVisibilityListener=!0,this._initVisibilityListener()),this.logger.info("前后台监听器已启用")}disableVisibilityListener(){this._enableVisibilityListener&&(this._enableVisibilityListener=!1,this.destroyVisibilityListener()),this.logger.info("前后台监听器已禁用")}isVisibilityListenerEnabled(){return this._enableVisibilityListener}addTask(e,t){return e&&"function"==typeof e.ad?new Promise((r,i)=>{let s={adInstance:e,options:t.options??{},callbackCollection:t.collection??{},resolve:r,reject:i,id:`ad_${Date.now()}_${Math.random().toString(36).substr(2,9)}`,_isResolved:!1,_isRejected:!1,_retryCount:0,_retryMsg:"ok"};this._taskStack.push(s),this._isRunning||this._compose()}):(this.logger.error("无效的广告实例 请正确实现.ad方法"),Promise.reject(Error("无效的广告实例")))}_compose(){if(0===this._taskStack.length){this._isRunning=!1,this._currentTask=null;return}if(!this._isForeground){this.logger.info(`应用处于后台,暂停任务执行,任务ID: ${this._taskStack.map(e=>e.id).join(",")}`),this._isRunning=!1;return}this._isRunning=!0;let e=[...this._taskStack];this._taskStack=[],this._currentBatchTasks=e;let t=e.map(e=>async(t,r)=>{let{adInstance:i,options:s,callbackCollection:n,resolve:a,id:o,_retryCount:c,_retryMsg:l}=e,_={count:c,retry:c>0,message:l};if(e._isResolved||e._isRejected)return void await r(t);this._currentTask=e;try{let c=async e=>{await r(Object.assign({},t,e))},l=await i.initialize(s).ad({options:s,collection:n,recovered:_},c),h=Object.assign({id:o,recovered:_},l);if(this.logger.info(`任务执行成功，成功信息：${JSON.stringify(h)}`),needRetryAdError({apiError:null==h?void 0:h.apiError,configuredAdTimeout:i._adTimeoutTime,errorRetryStrategy:this._errorRetryStrategy})&&!this._isForeground&&e._retryCount<this._maxRetryCount){var u;e._retryCount++,e._retryMsg=(null==h||null==(u=h.apiError)?void 0:u.errMsg)||"unknown";let t=`任务 ${o} 在后台失败，加入重试队列 (即将第 ${e._retryCount} 次重试, 最大重试次数 ${this._maxRetryCount}, 重试原因: ${e._retryMsg})`;this.logger.warn(t),h.recovered.retry=!0,h.recovered.count=e._retryCount,h.recovered.message=e._retryMsg,e._isResolved=!1,e._isRejected=!1,this._retryQueue.push(e)}else e._isResolved=!0;a(h),null==i||i.record(h)}catch(n){let s=Object.assign({id:o,apiError:n,recovered:_});this.logger.error(`任务执行失败, 继续下一个任务,错误信息：${JSON.stringify(s)}`),e._isRejected=!0;try{null==i||i.clear()}catch(e){this.logger.error("clear error: ",JSON.stringify(Object.assign({id:o,apiError:e})))}a(s),null==i||i.record(s),await r(t)}}),r={roundTasks:t.length};compose(t)(r,async e=>{this.logger.info("本轮活动队列已经清空",e),this._taskStack.length>0?Promise.resolve().then(()=>{this._compose()}):(this._isRunning=!1,this._currentTask=null,this._currentBatchTasks=[])})()}clearTasks(){if(this._currentTask){if(this._currentTask._isResolved||this._currentTask._isRejected){this._currentTask=null;return}try{this._currentTask.callbackCollection&&this._currentTask.callbackCollection.cancel&&this._currentTask.callbackCollection.cancel(),this._currentTask._isResolved=!0,this._currentTask.resolve()}catch(e){this.logger.error("clear current task error: ",e)}this._currentTask=null}this._currentBatchTasks.length>0&&(this._currentBatchTasks.forEach(e=>{if(e!==this._currentTask&&!e._isResolved&&!e._isRejected)try{e.callbackCollection&&e.callbackCollection.cancel&&e.callbackCollection.cancel(),e._isResolved=!0,e.resolve()}catch(e){this.logger.error("clear current batch task error: ",e)}}),this._currentBatchTasks=[]),this._taskStack.forEach(e=>{if(!e._isResolved&&!e._isRejected&&(e._isResolved=!0,e.resolve(),e.callbackCollection&&e.callbackCollection.cancel))try{e.callbackCollection.cancel()}catch(e){this.logger.error("clear task error: ",e)}}),this._retryQueue.forEach(e=>{if(!e._isResolved&&!e._isRejected&&(e._isResolved=!0,e.resolve(),e.callbackCollection&&e.callbackCollection.cancel))try{e.callbackCollection.cancel()}catch(e){this.logger.error("clear retry task error: ",e)}}),this._taskStack=[],this._retryQueue=[],this._isRunning=!1}getTaskCount(){return this._taskStack.filter(e=>!e._isResolved&&!e._isRejected).length+this._currentBatchTasks.filter(e=>e!==this._currentTask&&!e._isResolved&&!e._isRejected).length+(!this._currentTask||this._currentTask._isResolved||this._currentTask._isRejected?0:1)+this._retryQueue.filter(e=>!e._isResolved&&!e._isRejected).length}isRunning(){return this._isRunning}getCurrentTaskId(){var e;return(null==(e=this._currentTask)?void 0:e.id)||null}whenAllTasksComplete(){return new Promise(e=>{let t=null,r=()=>{let i=0===this._taskStack.length,s=!this._isRunning,n=null===this._currentTask,a=0===this._currentBatchTasks.length||this._currentBatchTasks.every(e=>e._isResolved||e._isRejected),o=0===this._retryQueue.length;i&&s&&n&&a&&o?(t&&clearTimeout(t),e()):t=setTimeout(r,500)};r()})}}const src_AdExecuteManager=AdExecuteManager;for(var __rspack_i in exports.AdExecuteManager=__webpack_exports__.AdExecuteManager,__webpack_exports__)-1===["AdExecuteManager"].indexOf(__rspack_i)&&(exports[__rspack_i]=__webpack_exports__[__rspack_i]);Object.defineProperty(exports,"__esModule",{value:!0});

package/dist/index.js

@@ -1 +1 @@
-import{Logger as e}from"@ad-execute-manager/helper";class t{static _instance=null;_taskStack=[];_currentBatchTasks=[];_isRunning=!1;_currentTask=null;_isForeground=!0;_appShowListener=null;_appHideListener=null;_enableVisibilityListener=!1;_maxRetryCount=1;_retryQueue=[];_errorRetryStrategy={timeout:!0,background:!0};constructor(t){this.logger=new e({prefix:"AdExecuteManager",enabled:!!(null==t?void 0:t.log)}),(null==t?void 0:t.errorRetryStrategy)&&(this._errorRetryStrategy=Object.assign({},this._errorRetryStrategy,null==t?void 0:t.errorRetryStrategy)),this._enableVisibilityListener=null==t?void 0:t.enableVisibilityListener,this._maxRetryCount=(null==t?void 0:t.maxRetryCount)??1,this._enableVisibilityListener&&this._initVisibilityListener()}initialize(e){return this}static getInstance(e){return t._instance||(t._instance=new t(e)),t._instance}static build(e){return t._instance||(t._instance=new t(e)),t._instance}static new(e){return new t(e)}static getSafeInstance(){return t._instance?t._instance:(this.logger.error("AdExecuteManager实例不存在"),null)}_initVisibilityListener(){!("u"<typeof tt)&&tt.onAppShow&&tt.onAppHide?(this._appShowListener=()=>{this._isForeground=!0,this._handleAppShow()},this._appHideListener=()=>{this._isForeground=!1,this._handleAppHide()},tt.onAppShow(this._appShowListener),tt.onAppHide(this._appHideListener),this.logger.info("前后台监听器已初始化")):this.logger.warn("tt API不可用，无法监听前后台状态")}_handleAppHide(){if(this._isRunning&&this._currentBatchTasks.length>0){let e=this._currentBatchTasks.filter(e=>{var t;return e.id!==(null==(t=this._currentTask)?void 0:t.id)&&!e._isResolved&&!e._isRejected});e.length>0&&(this.logger.info(`将 ${e.length} 个未执行的任务放回任务栈,任务ID: ${e.map(e=>e.id).join(",")}`),this._taskStack=[...e,...this._taskStack],this._currentBatchTasks=this._currentBatchTasks.filter(t=>!e.some(e=>e.id===t.id)))}}_handleAppShow(){this._retryQueue.length>0&&(this.logger.info(`应用进入前台:优先执行重试队列，任务数: ${this._retryQueue.length}, 任务ID: ${this._retryQueue.map(e=>e.id).join(",")}`),this._taskStack=[...this._retryQueue,...this._taskStack],this._retryQueue=[]),this._taskStack.length>0&&!this._isRunning&&(this.logger.info(`应用进入前台:恢复待执行任务数: ${this._taskStack.length}, 任务ID: ${this._taskStack.map(e=>e.id).join(",")}`),this._compose())}destroyVisibilityListener(){this._appShowListener&&"u">typeof tt&&tt.offAppShow&&(tt.offAppShow(this._appShowListener),this._appShowListener=null),this._appHideListener&&"u">typeof tt&&tt.offAppHide&&(tt.offAppHide(this._appHideListener),this._appHideListener=null),this.logger.info("前后台监听器已销毁")}enableVisibilityListener(){this._enableVisibilityListener||(this._enableVisibilityListener=!0,this._initVisibilityListener()),this.logger.info("前后台监听器已启用")}disableVisibilityListener(){this._enableVisibilityListener&&(this._enableVisibilityListener=!1,this.destroyVisibilityListener()),this.logger.info("前后台监听器已禁用")}isVisibilityListenerEnabled(){return this._enableVisibilityListener}addTask(e,t){return e&&"function"==typeof e.ad?new Promise((i,r)=>{let s={adInstance:e,options:t.options??{},callbackCollection:t.collection??{},resolve:i,reject:r,id:`ad_${Date.now()}_${Math.random().toString(36).substr(2,9)}`,_isResolved:!1,_isRejected:!1,_retryCount:0,_retryMsg:"ok"};this._taskStack.push(s),this._isRunning||this._compose()}):(this.logger.error("无效的广告实例 请正确实现.ad方法"),Promise.reject(Error("无效的广告实例")))}_compose(){if(0===this._taskStack.length){this._isRunning=!1,this._currentTask=null;return}if(!this._isForeground){this.logger.info(`应用处于后台,暂停任务执行,任务ID: ${this._taskStack.map(e=>e.id).join(",")}`),this._isRunning=!1;return}this._isRunning=!0;let e=[...this._taskStack];this._taskStack=[],this._currentBatchTasks=e;let t=e.map(e=>async(t,i)=>{let{adInstance:r,options:s,callbackCollection:n,resolve:a,id:l,_retryCount:o,_retryMsg:c}=e,h={count:o,retry:o>0,message:c};if(e._isResolved||e._isRejected)return void await i(t);this._currentTask=e;try{let o=async e=>{await i(Object.assign({},t,e))},c=await r.initialize(s).ad({options:s,collection:n,recovered:h},o),u=Object.assign({id:l,recovered:h},c);if(this.logger.info(`任务执行成功，成功信息：${JSON.stringify(u)}`),function({apiError:e,configuredAdTimeout:t,errorRetryStrategy:i}){var r;return!!((null==i?void 0:i.timeout)&&(null==e?void 0:e.errMsg)&&"string"==typeof e.errMsg&&e.errMsg.startsWith("ad_show_timeout: normal")&&(null==e?void 0:e.timeout)==t)||!!((null==i?void 0:i.background)&&(null==(r=e)?void 0:r.errMsg)&&"string"==typeof r.errMsg&&(r.errMsg.startsWith("app in background is not support show ad")||r.errMsg.startsWith("other controller is presented")))}({apiError:null==u?void 0:u.apiError,configuredAdTimeout:r._adTimeoutTime,errorRetryStrategy:this._errorRetryStrategy})&&!this._isForeground&&e._retryCount<this._maxRetryCount){var _;e._retryCount++,e._retryMsg=(null==u||null==(_=u.apiError)?void 0:_.errMsg)||"unknown";let t=`任务 ${l} 在后台失败，加入重试队列 (即将第 ${e._retryCount} 次重试, 最大重试次数 ${this._maxRetryCount}, 重试原因: ${e._retryMsg})`;this.logger.warn(t),u.recovered.retry=!0,u.recovered.count=e._retryCount,u.recovered.message=e._retryMsg,e._isResolved=!1,e._isRejected=!1,this._retryQueue.push(e)}else e._isResolved=!0;a(u),null==r||r.record(u)}catch(n){let s=Object.assign({id:l,apiError:n,recovered:h});this.logger.error(`任务执行失败, 继续下一个任务,错误信息：${JSON.stringify(s)}`),e._isRejected=!0;try{null==r||r.clear()}catch(e){this.logger.error("clear error: ",JSON.stringify(Object.assign({id:l,apiError:e})))}a(s),null==r||r.record(s),await i(t)}}),i={roundTasks:t.length};t.map(e=>(t,i)=>async r=>await e(Object.assign({},t,r),i)).reduce((e,t)=>(i,r)=>e(i,t(i,r)))(i,async e=>{this.logger.info("本轮活动队列已经清空",e),this._taskStack.length>0?Promise.resolve().then(()=>{this._compose()}):(this._isRunning=!1,this._currentTask=null,this._currentBatchTasks=[])})()}clearTasks(){if(this._currentTask){if(this._currentTask._isResolved||this._currentTask._isRejected){this._currentTask=null;return}try{this._currentTask.callbackCollection&&this._currentTask.callbackCollection.onCancel&&this._currentTask.callbackCollection.onCancel(),this._currentTask._isResolved=!0,this._currentTask.resolve()}catch(e){this.logger.error("clear current task error: ",e)}this._currentTask=null}this._currentBatchTasks.length>0&&(this._currentBatchTasks.forEach(e=>{if(e!==this._currentTask&&!e._isResolved&&!e._isRejected)try{e.callbackCollection&&e.callbackCollection.onCancel&&e.callbackCollection.onCancel(),e._isResolved=!0,e.resolve()}catch(e){this.logger.error("clear current batch task error: ",e)}}),this._currentBatchTasks=[]),this._taskStack.forEach(e=>{if(!e._isResolved&&!e._isRejected&&(e._isResolved=!0,e.resolve(),e.callbackCollection&&e.callbackCollection.onCancel))try{e.callbackCollection.onCancel()}catch(e){this.logger.error("clear task error: ",e)}}),this._retryQueue.forEach(e=>{if(!e._isResolved&&!e._isRejected&&(e._isResolved=!0,e.resolve(),e.callbackCollection&&e.callbackCollection.onCancel))try{e.callbackCollection.onCancel()}catch(e){this.logger.error("clear retry task error: ",e)}}),this._taskStack=[],this._retryQueue=[],this._isRunning=!1}getTaskCount(){return this._taskStack.filter(e=>!e._isResolved&&!e._isRejected).length+this._currentBatchTasks.filter(e=>e!==this._currentTask&&!e._isResolved&&!e._isRejected).length+(!this._currentTask||this._currentTask._isResolved||this._currentTask._isRejected?0:1)+this._retryQueue.filter(e=>!e._isResolved&&!e._isRejected).length}isRunning(){return this._isRunning}getCurrentTaskId(){var e;return(null==(e=this._currentTask)?void 0:e.id)||null}whenAllTasksComplete(){return new Promise(e=>{let t=null,i=()=>{let r=0===this._taskStack.length,s=!this._isRunning,n=null===this._currentTask,a=0===this._currentBatchTasks.length||this._currentBatchTasks.every(e=>e._isResolved||e._isRejected),l=0===this._retryQueue.length;r&&s&&n&&a&&l?(t&&clearTimeout(t),e()):t=setTimeout(i,500)};i()})}}let i=t;export{i as AdExecuteManager};
+import{Logger as e}from"@ad-execute-manager/logger";class t{static _instance=null;_taskStack=[];_currentBatchTasks=[];_isRunning=!1;_currentTask=null;_isForeground=!0;_appShowListener=null;_appHideListener=null;_enableVisibilityListener=!1;_maxRetryCount=1;_retryQueue=[];_errorRetryStrategy={timeout:!0,background:!0};constructor(t){this.logger=new e({prefix:"AdExecuteManager",enabled:!!(null==t?void 0:t.log)}),(null==t?void 0:t.errorRetryStrategy)&&(this._errorRetryStrategy=Object.assign({},this._errorRetryStrategy,null==t?void 0:t.errorRetryStrategy)),this._enableVisibilityListener=null==t?void 0:t.enableVisibilityListener,this._maxRetryCount=(null==t?void 0:t.maxRetryCount)??1,this._enableVisibilityListener&&this._initVisibilityListener()}initialize(e){return this}static getInstance(e){return t._instance||(t._instance=new t(e)),t._instance}static build(e){return t._instance||(t._instance=new t(e)),t._instance}static new(e){return new t(e)}static getSafeInstance(){return t._instance?t._instance:(this.logger.error("AdExecuteManager实例不存在"),null)}_initVisibilityListener(){!("u"<typeof tt)&&tt.onAppShow&&tt.onAppHide?(this._appShowListener=()=>{this._isForeground=!0,this._handleAppShow()},this._appHideListener=()=>{this._isForeground=!1,this._handleAppHide()},tt.onAppShow(this._appShowListener),tt.onAppHide(this._appHideListener),this.logger.info("前后台监听器已初始化")):this.logger.warn("tt API不可用，无法监听前后台状态")}_handleAppHide(){if(this._isRunning&&this._currentBatchTasks.length>0){let e=this._currentBatchTasks.filter(e=>{var t;return e.id!==(null==(t=this._currentTask)?void 0:t.id)&&!e._isResolved&&!e._isRejected});e.length>0&&(this.logger.info(`将 ${e.length} 个未执行的任务放回任务栈,任务ID: ${e.map(e=>e.id).join(",")}`),this._taskStack=[...e,...this._taskStack],this._currentBatchTasks=this._currentBatchTasks.filter(t=>!e.some(e=>e.id===t.id)))}}_handleAppShow(){this._retryQueue.length>0&&(this.logger.info(`应用进入前台:优先执行重试队列，任务数: ${this._retryQueue.length}, 任务ID: ${this._retryQueue.map(e=>e.id).join(",")}`),this._taskStack=[...this._retryQueue,...this._taskStack],this._retryQueue=[]),this._taskStack.length>0&&!this._isRunning&&(this.logger.info(`应用进入前台:恢复待执行任务数: ${this._taskStack.length}, 任务ID: ${this._taskStack.map(e=>e.id).join(",")}`),this._compose())}destroyVisibilityListener(){this._appShowListener&&"u">typeof tt&&tt.offAppShow&&(tt.offAppShow(this._appShowListener),this._appShowListener=null),this._appHideListener&&"u">typeof tt&&tt.offAppHide&&(tt.offAppHide(this._appHideListener),this._appHideListener=null),this.logger.info("前后台监听器已销毁")}enableVisibilityListener(){this._enableVisibilityListener||(this._enableVisibilityListener=!0,this._initVisibilityListener()),this.logger.info("前后台监听器已启用")}disableVisibilityListener(){this._enableVisibilityListener&&(this._enableVisibilityListener=!1,this.destroyVisibilityListener()),this.logger.info("前后台监听器已禁用")}isVisibilityListenerEnabled(){return this._enableVisibilityListener}addTask(e,t){return e&&"function"==typeof e.ad?new Promise((i,r)=>{let s={adInstance:e,options:t.options??{},callbackCollection:t.collection??{},resolve:i,reject:r,id:`ad_${Date.now()}_${Math.random().toString(36).substr(2,9)}`,_isResolved:!1,_isRejected:!1,_retryCount:0,_retryMsg:"ok"};this._taskStack.push(s),this._isRunning||this._compose()}):(this.logger.error("无效的广告实例 请正确实现.ad方法"),Promise.reject(Error("无效的广告实例")))}_compose(){if(0===this._taskStack.length){this._isRunning=!1,this._currentTask=null;return}if(!this._isForeground){this.logger.info(`应用处于后台,暂停任务执行,任务ID: ${this._taskStack.map(e=>e.id).join(",")}`),this._isRunning=!1;return}this._isRunning=!0;let e=[...this._taskStack];this._taskStack=[],this._currentBatchTasks=e;let t=e.map(e=>async(t,i)=>{let{adInstance:r,options:s,callbackCollection:n,resolve:a,id:l,_retryCount:o,_retryMsg:c}=e,h={count:o,retry:o>0,message:c};if(e._isResolved||e._isRejected)return void await i(t);this._currentTask=e;try{let o=async e=>{await i(Object.assign({},t,e))},c=await r.initialize(s).ad({options:s,collection:n,recovered:h},o),u=Object.assign({id:l,recovered:h},c);if(this.logger.info(`任务执行成功，成功信息：${JSON.stringify(u)}`),function({apiError:e,configuredAdTimeout:t,errorRetryStrategy:i}){var r;return!!((null==i?void 0:i.timeout)&&(null==e?void 0:e.errMsg)&&"string"==typeof e.errMsg&&e.errMsg.startsWith("ad_show_timeout: normal")&&(null==e?void 0:e.timeout)==t)||!!((null==i?void 0:i.background)&&(null==(r=e)?void 0:r.errMsg)&&"string"==typeof r.errMsg&&(r.errMsg.startsWith("app in background is not support show ad")||r.errMsg.startsWith("other controller is presented")))}({apiError:null==u?void 0:u.apiError,configuredAdTimeout:r._adTimeoutTime,errorRetryStrategy:this._errorRetryStrategy})&&!this._isForeground&&e._retryCount<this._maxRetryCount){var _;e._retryCount++,e._retryMsg=(null==u||null==(_=u.apiError)?void 0:_.errMsg)||"unknown";let t=`任务 ${l} 在后台失败，加入重试队列 (即将第 ${e._retryCount} 次重试, 最大重试次数 ${this._maxRetryCount}, 重试原因: ${e._retryMsg})`;this.logger.warn(t),u.recovered.retry=!0,u.recovered.count=e._retryCount,u.recovered.message=e._retryMsg,e._isResolved=!1,e._isRejected=!1,this._retryQueue.push(e)}else e._isResolved=!0;a(u),null==r||r.record(u)}catch(n){let s=Object.assign({id:l,apiError:n,recovered:h});this.logger.error(`任务执行失败, 继续下一个任务,错误信息：${JSON.stringify(s)}`),e._isRejected=!0;try{null==r||r.clear()}catch(e){this.logger.error("clear error: ",JSON.stringify(Object.assign({id:l,apiError:e})))}a(s),null==r||r.record(s),await i(t)}}),i={roundTasks:t.length};t.map(e=>(t,i)=>async r=>await e(Object.assign({},t,r),i)).reduce((e,t)=>(i,r)=>e(i,t(i,r)))(i,async e=>{this.logger.info("本轮活动队列已经清空",e),this._taskStack.length>0?Promise.resolve().then(()=>{this._compose()}):(this._isRunning=!1,this._currentTask=null,this._currentBatchTasks=[])})()}clearTasks(){if(this._currentTask){if(this._currentTask._isResolved||this._currentTask._isRejected){this._currentTask=null;return}try{this._currentTask.callbackCollection&&this._currentTask.callbackCollection.cancel&&this._currentTask.callbackCollection.cancel(),this._currentTask._isResolved=!0,this._currentTask.resolve()}catch(e){this.logger.error("clear current task error: ",e)}this._currentTask=null}this._currentBatchTasks.length>0&&(this._currentBatchTasks.forEach(e=>{if(e!==this._currentTask&&!e._isResolved&&!e._isRejected)try{e.callbackCollection&&e.callbackCollection.cancel&&e.callbackCollection.cancel(),e._isResolved=!0,e.resolve()}catch(e){this.logger.error("clear current batch task error: ",e)}}),this._currentBatchTasks=[]),this._taskStack.forEach(e=>{if(!e._isResolved&&!e._isRejected&&(e._isResolved=!0,e.resolve(),e.callbackCollection&&e.callbackCollection.cancel))try{e.callbackCollection.cancel()}catch(e){this.logger.error("clear task error: ",e)}}),this._retryQueue.forEach(e=>{if(!e._isResolved&&!e._isRejected&&(e._isResolved=!0,e.resolve(),e.callbackCollection&&e.callbackCollection.cancel))try{e.callbackCollection.cancel()}catch(e){this.logger.error("clear retry task error: ",e)}}),this._taskStack=[],this._retryQueue=[],this._isRunning=!1}getTaskCount(){return this._taskStack.filter(e=>!e._isResolved&&!e._isRejected).length+this._currentBatchTasks.filter(e=>e!==this._currentTask&&!e._isResolved&&!e._isRejected).length+(!this._currentTask||this._currentTask._isResolved||this._currentTask._isRejected?0:1)+this._retryQueue.filter(e=>!e._isResolved&&!e._isRejected).length}isRunning(){return this._isRunning}getCurrentTaskId(){var e;return(null==(e=this._currentTask)?void 0:e.id)||null}whenAllTasksComplete(){return new Promise(e=>{let t=null,i=()=>{let r=0===this._taskStack.length,s=!this._isRunning,n=null===this._currentTask,a=0===this._currentBatchTasks.length||this._currentBatchTasks.every(e=>e._isResolved||e._isRejected),l=0===this._retryQueue.length;r&&s&&n&&a&&l?(t&&clearTimeout(t),e()):t=setTimeout(i,500)};i()})}}let i=t;export{i as AdExecuteManager};

package/dist/typings/ad.d.ts

@@ -80,14 +80,10 @@ export type CallbackCollection = {
      * 半途退出广告外部回调
      */
     halfway?: (ctx?: IExeCallbackArgs) => void;
-    /**
-     * 完成广告外部回调 不管看不看完
-     */
-    complete?: (ctx?: IExeCallbackArgs) => void;
     /**
      * 取消广告外部回调
      */
-    onCancel?: (ctx?: IExeCallbackArgs) => void;
+    cancel?: (ctx?: IExeCallbackArgs) => void;
     /**
      * 展示广告外部回调
      */
@@ -115,6 +111,20 @@ export type RecoveredInfo = {
      */
     message: string;
 };
+export type IApiError = {
+    /**
+     * 错误信息
+     */
+    errMsg?: string;
+    /**
+     * 错误码
+     */
+    errorCode?: number;
+    /**
+     * 错误信息
+     */
+    message?: string;
+};
 export type ICallbackArgs = {
     /**
      * 广告执行场景

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ad-execute-manager/core",
-  "version": "2.0.1",
+  "version": "2.0.3",
   "description": "Core functionality for ad execution management including AdExecuteManager, utility functions, and middleware composition.",
   "type": "module",
   "exports": {
@@ -51,8 +51,8 @@
     "prepublishOnly": "npm run build"
   },
 
-  "dependencies": {
-    "@ad-execute-manager/helper": "^2.0.1"
+  "peerDependencies": {
+    "@ad-execute-manager/logger": "^2.0.2"
   },
   "devDependencies": {
     "@babel/eslint-parser": "^7.28.5",