@ad-execute-manager/ad-reward 2.0.2 → 2.0.3

package/dist/RewardAdFather.d.ts

@@ -27,12 +27,13 @@ declare class RewardAdFather {
      * @param {Object} ctx 上下文对象，用于传递数据和状态
      * @param {Object} ctx.options 广告执行选项
      * @param {Object} ctx.collection 回调集合
-     * @returns {Promise} 广告执行结果的Promise
      */
     static executeWithManager(adInstance: any, ctx: {
         options: any;
         collection: any;
-    }): Promise<any>;
+    }): Promise<import("@ad-execute-manager/core/dist/AdExecuteManager.js").ITaskResult & {
+        [key: string]: any;
+    }>;
     /**
      * @param {IConstructArgs} args
      */
@@ -103,12 +104,13 @@ declare class RewardAdFather {
      * @param {Object} [ctx] 上下文对象，用于传递数据和状态
      * @param {IRewordAdConfig} [ctx.options] 广告执行选项
      * @param {CallbackCollection} [ctx.collection] 回调集合
-     * @returns {Promise.<unknown>} 广告执行结果的Promise
      */
     addExecuteManager(ctx?: {
         options?: IRewordAdConfig;
         collection?: CallbackCollection;
-    }): Promise<unknown>;
+    }): Promise<import("@ad-execute-manager/core/dist/AdExecuteManager.js").ITaskResult & {
+        [key: string]: any;
+    }>;
     destroy(): void;
     /**
      * 清理广告实例

package/dist/RewardAdNovel.d.ts

@@ -1,5 +1,5 @@
 export default RewardAdNovel;
-export type IRewordAdConfig = any;
+export type IRewordAdConfig = import("./typings/ad.js").IRewordAdConfig;
 export type ICallbackArgs = {
     /**
      * 广告执行场景
@@ -83,24 +83,6 @@ export type ICloseArgs = {
      */
     count: number;
 };
-export type IEndArgs = {
-    /**
-     * 是否解锁全部
-     */
-    can_unlock_all?: boolean;
-    /**
-     * 是否解锁小说
-     */
-    can_unlock_novel?: boolean;
-    /**
-     * 剩余次数
-     */
-    remain?: number;
-    /**
-     * 结束类型
-     */
-    end_type?: "halfway" | "finished";
-};
 export type IRewardedVideoAd = {
     /**
      * 显示激励视频广告
@@ -108,7 +90,7 @@ export type IRewardedVideoAd = {
     show: () => Promise<void>;
 };
 /**
- * @typedef {import('../typings/ad.js').IRewordAdConfig} IRewordAdConfig
+ * @typedef {import('./typings/ad.js').IRewordAdConfig} IRewordAdConfig
  */
 /**
  * @typedef ICallbackArgs
@@ -141,14 +123,6 @@ export type IRewardedVideoAd = {
  * @property {boolean} isEnded 是否看完
  * @property {number} count 完整观看次数
  */
-/**
- * @typedef IEndArgs
- * @property {boolean} [can_unlock_all] 是否解锁全部
- * @property {boolean} [can_unlock_novel] 是否解锁小说
- * @property {number} [remain] 剩余次数
- * @property {'halfway' | 'finished'} [end_type] 结束类型
- *
- */
 /**
  * @typedef IRewardedVideoAd
  * @property {() => Promise.<void>} show 显示激励视频广告
@@ -203,7 +177,6 @@ declare class RewardAdNovel extends RewardAdFather {
     bindApiAdErrorLister: any;
     _bindShiftCloseLister: any;
     _bindShiftErrorLister: any;
-    _adConfig: any;
     /**
      * 初始化
      * 子类可以选择覆盖此方法，或使用默认实现
@@ -226,13 +199,13 @@ declare class RewardAdNovel extends RewardAdFather {
      * @param {object} _args
      * @param {string} _args.scene 广告执行场景 必填
      * @param {number} [_args.result] 广告执行成功结果 必填
-     * @param {import('../typings/ad.js').RecoveredInfo} [_args.recovered] 恢复重试信息
+     * @param {import('./typings/ad.js').RecoveredInfo} [_args.recovered] 恢复重试信息
      * @returns
      */
     _onInnerAdShowSuccess(_args: {
         scene: string;
         result?: number;
-        recovered?: any;
+        recovered?: import("./typings/ad.js").RecoveredInfo;
     }): any;
     /**
      * 广告展示超时设置
@@ -290,14 +263,14 @@ declare class RewardAdNovel extends RewardAdFather {
      * @param {string} _args.scene 广告执行场景 必填
      * @param {string} [_args.msg] 广告执行成功原因
      * @param {0|1} _args.result 广告执行成功结果 必填
-     * @param {import('../typings/ad.js').RecoveredInfo} [_args.recovered] 恢复重试信息
+     * @param {import('./typings/ad.js').RecoveredInfo} [_args.recovered] 恢复重试信息
      * @returns
      */
     protected _adShowSuccessAnalytics(_args: {
         scene: string;
         msg?: string;
         result: 0 | 1;
-        recovered?: any;
+        recovered?: import("./typings/ad.js").RecoveredInfo;
     }): any;
     /**
      * 广告展示失败分析
@@ -369,40 +342,28 @@ declare class RewardAdNovel extends RewardAdFather {
         ad_count: number;
     }): any;
     get rewardAd(): import("./typings/create-rewarded-video-ad.js").RewardedVideoAd;
-    /**
-     * 确保广告按顺序执行
-     * @override
-     * @param {Object} [ctx] 上下文对象，用于传递数据和状态
-     * @param {IRewordAdConfig} [ctx.options] 广告执行选项
-     * @param {import('../typings/ad.js').CallbackCollection} [ctx.collection] 回调集合
-     * @returns {Promise.<IEndArgs & ICloseArgs | Undefined>}
-     */
-    override addExecuteManager(ctx?: {
-        options?: IRewordAdConfig;
-        collection?: any;
-    }): Promise<(IEndArgs & ICloseArgs) | undefined>;
     /**
      * @override
      * @param {object} [ctx] 广告执行上下文
-     * @param {import('../typings/ad.js').IRewordAdConfig} [ctx.options] 广告执行选项
-     * @param {import('../typings/ad.js').CallbackCollection} [ctx.collection] 回调集合
-     * @param {import('../typings/ad.js').RecoveredInfo} [ctx.recovered] 恢复重试信息
+     * @param {import('./typings/ad.js').IRewordAdConfig} [ctx.options] 广告执行选项
+     * @param {import('./typings/ad.js').CallbackCollection} [ctx.collection] 回调集合
+     * @param {import('./typings/ad.js').RecoveredInfo} [ctx.recovered] 恢复重试信息
      * @param {Function} next 执行下一个任务的回调函数，手动调用以继续执行流程
-     * @returns {Promise.<IEndArgs & ICloseArgs | Undefined>}
+     * @returns {Promise.<object | Undefined>}
      */
     override ad(ctx?: {
-        options?: any;
-        collection?: any;
-        recovered?: any;
-    }, next?: Function): Promise<(IEndArgs & ICloseArgs) | undefined>;
-    _recovered: any;
+        options?: import("./typings/ad.js").IRewordAdConfig;
+        collection?: import("./typings/ad.js").CallbackCollection;
+        recovered?: import("./typings/ad.js").RecoveredInfo;
+    }, next?: Function): Promise<object | undefined>;
+    _recovered: import("./typings/ad.js").RecoveredInfo;
     /**
      * @param {object} [ctx] 广告执行上下文
      * @param {object} [ctx.options] 广告执行选项
      * @param {number} [ctx.options.scene] 广告执行场景 必填
      * @param {number} [ctx.options.timeout] 广告超时时间 单位ms
      * @param {object} ctx.collection 回调集合
-     * @param {import('../typings/ad.js').RecoveredInfo} [ctx.recovered] 恢复重试信息
+     * @param {import('./typings/ad.js').RecoveredInfo} [ctx.recovered] 恢复重试信息
      * @param {(v?: unknown) => void} ctx.collection.resolve 广告执行成功的回调函数
      * @param {(v?: unknown) => void} [ctx.collection.reject] 广告执行失败的回调函数
      * @param {(v?: unknown) => void} [ctx.collection.before] 广告执行前的回调函数
@@ -416,7 +377,7 @@ declare class RewardAdNovel extends RewardAdFather {
             timeout?: number;
         };
         collection: object;
-        recovered?: any;
+        recovered?: import("./typings/ad.js").RecoveredInfo;
     }, next?: Function): void;
     _before: any;
     _success: any;

package/dist/typings/ad.d.ts

@@ -69,7 +69,7 @@ export type IExeCallbackArgs = {
 };
 export type CallbackCollection = {
     /**
-     * 每次外部回调
+     * 完成广告外部回调 不管看不看完
      */
     always?: (ctx?: IExeCallbackArgs) => void;
     /**
@@ -80,14 +80,10 @@ export type CallbackCollection = {
      * 半途退出广告外部回调
      */
     halfway?: (ctx?: IExeCallbackArgs) => void;
-    /**
-     * 完成广告外部回调 不管看不看完
-     */
-    complete?: (ctx?: IExeCallbackArgs) => void;
     /**
      * 取消广告外部回调
      */
-    onCancel?: (ctx?: IExeCallbackArgs) => void;
+    cancel?: (ctx?: IExeCallbackArgs) => void;
     /**
      * 展示广告外部回调
      */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ad-execute-manager/ad-reward",
-  "version": "2.0.2",
+  "version": "2.0.3",
   "description": "Reward ad-related classes including RewardAdFather and RewardAdNovel for ad management.",
   "type": "module",
   "exports": {
@@ -57,7 +57,7 @@
     "@ad-execute-manager/serializable-error": "^2.0.2"
   },
   "peerDependencies": {
-    "@ad-execute-manager/core": "^2.0.2",
+    "@ad-execute-manager/core": "^2.0.3",
     "@ad-execute-manager/logger": "^2.0.2"
   },
   "devDependencies": {