@jolibox/implement 1.1.26 → 1.1.28

package/implement.build.log

@@ -1,9 +1,9 @@
 Invoking: npm run clean && npm run build:esm && tsc 
 
-> @jolibox/implement@1.1.26 clean
+> @jolibox/implement@1.1.28 clean
 > rimraf ./dist
 
 
-> @jolibox/implement@1.1.26 build:esm
+> @jolibox/implement@1.1.28 build:esm
 > BUILD_VERSION=$(node -p "require('./package.json').version")  node esbuild.config.js --format=esm
 

package/package.json

@@ -1,15 +1,15 @@
 {
   "name": "@jolibox/implement",
   "description": "This project is Jolibox JS-SDk implement for Native && H5",
-  "version": "1.1.26",
+  "version": "1.1.28",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "license": "MIT",
   "dependencies": {
-    "@jolibox/common": "1.1.26",
-    "@jolibox/types": "1.1.26",
-    "@jolibox/native-bridge": "1.1.26",
-    "@jolibox/ads": "1.1.26",
+    "@jolibox/common": "1.1.28",
+    "@jolibox/types": "1.1.28",
+    "@jolibox/native-bridge": "1.1.28",
+    "@jolibox/ads": "1.1.28",
     "localforage": "1.10.0",
     "@jolibox/ui": "1.0.0",
     "web-vitals": "4.2.4"

package/src/common/context/index.ts

@@ -36,6 +36,17 @@ const env = Object.assign({}, nativeEnv?.() ?? defaultEnv);
 
 type MPType = 'game' | 'miniApp';
 
+export enum SDKEnvironment {
+  jolibox = 'jolibox', // 默认
+  dlightek = 'dlightek', // 传音
+  funmax = 'funmax' // 小米
+}
+
+function hasMetaTag(name: string, content: string): boolean {
+  const metaTag = document?.head.querySelector(`meta[name="${name}"][content="${content}"]`);
+  return metaTag !== null;
+}
+
 const wrapContext = () => {
   const { payloadJson, headerJson, signature } = env.schema.length ? parseUrlQuery(env.schema) : {};
   const defaultSessionId = `${env.deviceInfo.did}-${new Date().getTime()}`;
@@ -115,6 +126,14 @@ const wrapContext = () => {
     get language(): string {
       return env.deviceInfo.lang;
     },
+    get sdkEnvironment(): SDKEnvironment {
+      const hasDlightekMeta = hasMetaTag('dlightek', 'jolibox');
+      if (hasDlightekMeta) {
+        return SDKEnvironment.dlightek;
+      }
+      return SDKEnvironment.jolibox;
+    },
+
     onEnvConfigChanged: (newConfig: Partial<Env>) => {
       mergeWith(env, newConfig, mergeArray);
     },

package/src/common/rewards/fetch-reward.ts

@@ -57,9 +57,7 @@ export const createRewardFrequencyConfigFetcher = (rewardsHelper: RewardsHelper)
       '/api/fe-configs/web-common/global-config',
       {}
     );
-    if (res.code !== 'SUCCESS') {
-      return { joliCoinUseAndCharge: DefaltJoliCoinUseAndCharge };
-    }
+
     rewardsEmitter.emit(UseModalFrequencyEventName, {
       joliCoinUseAndCharge: res.data?.joliCoinUseAndCharge || DefaltJoliCoinUseAndCharge
     });

package/src/h5/api/ads.ts

@@ -8,12 +8,128 @@ import {
   createJolicoinRewardHandler,
   createJolicoinOnlyRewardHandler
 } from '@/common/rewards';
-import { JoliboxAdsForGame, type IAdsContext } from '@jolibox/ads';
-import { context } from '@/common/context';
+import {
+  JoliboxAdsForGame,
+  type IAdsContext,
+  type IAdsInitParams,
+  type IAdBreakParams,
+  type IAdConfigParams,
+  type IAdUnitParams
+} from '@jolibox/ads';
+import { context, SDKEnvironment } from '@/common/context';
 import '../rewards';
 
-const commands = createCommands();
+declare global {
+  interface Window {
+    h5sdk: any;
+  }
+}
+
+// 统一的广告处理器接口
+interface IAdsHandler {
+  init(config?: IAdsInitParams): void;
+  adConfig(params: IAdConfigParams): void;
+  adBreak(params: IAdBreakParams): Promise<void> | void;
+  adUnit(params: IAdUnitParams): void;
+  getAdsInstance(): JoliboxAdsForGame | any;
+}
+
+// 具体处理器实现
+class DlightekAdsHandler implements IAdsHandler {
+  constructor(private ads: any) {}
+
+  getAdsInstance(): any {
+    return this.ads;
+  }
+
+  init(_config?: IAdsInitParams): void {
+    // Dlightek 不需要初始化
+  }
+
+  adConfig(params: IAdConfigParams): void {
+    this.ads.adConfig(params);
+  }
+
+  adBreak(params: IAdBreakParams): void {
+    this.ads.adBreak(params);
+  }
+
+  adUnit(_params: IAdUnitParams): void {
+    // Dlightek 不需要 adUnit
+  }
+}
+
+class JoliboxAdsHandler implements IAdsHandler {
+  constructor(private ads: JoliboxAdsForGame) {}
+
+  getAdsInstance(): JoliboxAdsForGame {
+    return this.ads;
+  }
+
+  init(config?: IAdsInitParams): void {
+    this.ads.init(config);
+  }
+
+  adConfig(params: IAdConfigParams): void {
+    this.ads.adConfig(params);
+  }
+
+  async adBreak(params: IAdBreakParams): Promise<void> {
+    if (params.type === 'reward') {
+      try {
+        const rewardsTypes = await rewardsHelper.getRewardsTypes(httpClient);
+        await rewardsHelper.handleReward(rewardsTypes, params);
+      } catch (e) {
+        console.info('handleReward failed', e);
+        params.adBreakDone?.({
+          breakType: params.type,
+          breakFormat: params.type === 'reward' ? 'reward' : 'interstitial',
+          breakStatus: 'noAdPreloaded'
+        });
+      }
+    } else {
+      this.ads.adBreak(params);
+    }
+  }
+
+  adUnit(params: IAdUnitParams): void {
+    this.ads.adUnit(params);
+  }
+}
+
+class H5AdsManager {
+  private context: IAdsContext<'GAME'>;
+  private cacheHandler: IAdsHandler | null = null;
+
+  constructor(context: IAdsContext<'GAME'>) {
+    this.context = context;
+  }
+
+  private createAdsHandler(sdkEnvironment: SDKEnvironment): IAdsHandler {
+    if (this.cacheHandler) {
+      return this.cacheHandler;
+    }
+
+    switch (sdkEnvironment) {
+      case SDKEnvironment.dlightek: {
+        this.cacheHandler = new DlightekAdsHandler(window.h5sdk);
+        break;
+      }
+      default: {
+        const joliboxAds = new JoliboxAdsForGame(this.context);
+        this.cacheHandler = new JoliboxAdsHandler(joliboxAds);
+        break;
+      }
+    }
+    return this.cacheHandler;
+  }
 
+  getAdsHandler(sdkEnvironment: SDKEnvironment): IAdsHandler {
+    return this.createAdsHandler(sdkEnvironment);
+  }
+}
+
+const commands = createCommands();
 const adEventEmitter = new EventEmitter<{
   isAdShowing: [boolean];
 }>();
@@ -25,6 +141,14 @@ const adsContext: IAdsContext<'GAME'> = {
   checkNetwork: () => httpClientManager.getNetworkStatus(),
   track,
   eventEmitter: adEventEmitter,
+  getWindowInfo: () => ({
+    width: window.innerWidth * window.devicePixelRatio,
+    height: window.innerHeight * window.devicePixelRatio,
+    statusBarHeight: 0
+  }),
+  handleLinkClicked: (link) => {
+    window.open(link, '_blank');
+  },
   getContextInfo: () => {
     return {
       hostAppId: context.hostInfo?.aid ?? '1',
@@ -40,7 +164,8 @@ const adsContext: IAdsContext<'GAME'> = {
       deviceModel: context.deviceInfo.model,
       osType: platform.isAndroid ? 'ANDROID' : platform.isiOS ? 'IOS' : 'PC',
       runtimeType: 'WEB',
-      platform: 1000 // WebSDK
+      platform: 1000, // WebSDK
+      joliSource: context.joliSource ?? ''
     };
   }
 };
@@ -51,14 +176,17 @@ const handleUnlockSuccess = (params: { quantity: number; balance: number }) => {
   });
 };
 
-const ads = new JoliboxAdsForGame(adsContext);
-rewardsHelper.registerRewardHandler('ADS', createAdsRewardHandler(ads));
+const adsManager = new H5AdsManager(adsContext);
+const adsHandler = adsManager.getAdsHandler(context.sdkEnvironment);
+
+rewardsHelper.registerRewardHandler('ADS', createAdsRewardHandler(adsHandler.getAdsInstance()));
 rewardsHelper.registerRewardHandler(
   'JOLI_COIN',
   createJolicoinRewardHandler(httpClient, {
     onUnlockSuccess: handleUnlockSuccess.bind(this)
   }) as unknown as (params?: unknown) => Promise<boolean>
 );
+
 rewardsHelper.registerRewardHandler(
   'JOLI_COIN_ONLY',
   createJolicoinOnlyRewardHandler(httpClient, {
@@ -70,32 +198,18 @@ adEventEmitter.on('isAdShowing', (isAdShowing) => {
   notifyCustomEvent('JOLIBOX_ADS_EVENT', { isAdShowing });
 });
 
-commands.registerCommand('AdsSDK.init', (config) => {
-  ads.init(config);
+commands.registerCommand('AdsSDK.init', (params?: IAdsInitParams) => {
+  adsHandler.init(params);
 });
 
-commands.registerCommand('AdsSDK.adConfig', (params) => {
-  ads.adConfig(params);
+commands.registerCommand('AdsSDK.adConfig', (params: IAdConfigParams) => {
+  adsHandler.adConfig(params);
 });
 
-commands.registerCommand('AdsSDK.adBreak', (params) => {
-  if (params.type === 'reward') {
-    rewardsHelper.getRewardsTypes(httpClient).then((rewardsTypes) => {
-      rewardsHelper.handleReward(rewardsTypes, params).catch((e) => {
-        // error should terminate the reward handler, invoke unlock failed
-        console.info('handleReward failed', e);
-        params.adBreakDone?.({
-          breakType: params.type,
-          breakFormat: params.type === 'reward' ? 'reward' : 'interstitial',
-          breakStatus: 'noAdPreloaded'
-        });
-      });
-    });
-  } else {
-    ads.adBreak(params);
-  }
+commands.registerCommand('AdsSDK.adBreak', (params: IAdBreakParams) => {
+  adsHandler.adBreak(params);
 });
 
-commands.registerCommand('AdsSDK.adUnit', (params) => {
-  ads.adUnit(params);
+commands.registerCommand('AdsSDK.adUnit', (params: IAdUnitParams) => {
+  adsHandler.adUnit(params);
 });

package/src/h5/http/index.ts

@@ -1,6 +1,7 @@
 import { IHttpClient } from '@/common/http';
 import { xUserAgent } from '../../common/http/xua';
 import { context } from '@/common/context';
+import { platform } from '@jolibox/common';
 
 declare global {
   interface Window {
@@ -131,7 +132,9 @@ class JoliboxHttpClient implements IHttpClient {
         headers ?? {},
         { 'Content-Type': 'application/json' },
         xua ? { 'x-user-agent': xua } : {},
-        joliSource ? { 'x-joli-source': joliSource } : {}
+        joliSource ? { 'x-joli-source': joliSource } : {},
+        { 'x-os-type': platform.isAndroid ? 'ANDROID' : platform.isiOS ? 'IOS' : 'PC' },
+        { 'x-runtime-type': 'WEB' }
       );
       const response = await fetch(url, {
         method: 'POST',

package/src/native/api/ads.ts

@@ -54,6 +54,15 @@ const adsContext: IAdsContext<'GAME'> = {
   checkNetwork: checkNetworkStatus,
   track,
   eventEmitter: adEventEmitter,
+  // TODO: @Deng Xue
+  getWindowInfo: () => ({
+    width: window.innerWidth * window.devicePixelRatio,
+    height: window.innerHeight * window.devicePixelRatio,
+    statusBarHeight: 30
+  }),
+  handleLinkClicked: (link) => {
+    window.open(link, '_blank');
+  },
   getContextInfo: () => {
     return {
       hostAppId: context.hostInfo?.aid ?? '1',
@@ -69,7 +78,8 @@ const adsContext: IAdsContext<'GAME'> = {
       deviceModel: context.deviceInfo.model,
       osType: context.platform === 'android' ? 'ANDROID' : context.platform === 'ios' ? 'IOS' : 'PC',
       runtimeType: 'APP',
-      platform: 1000 // WebSDK
+      platform: 1000, // WebSDK
+      joliSource: context.joliSource ?? ''
     };
   }
 };