@jolibox/implement 1.3.5-beta.4 → 1.3.5

package/implement.build.log

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

package/package.json

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

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

@@ -11,7 +11,8 @@ type TaskEvent =
   | 'ADS_UNLOCK_GAME' // 广告解锁
   | 'GAME_TASK_EVENT' // 关卡行为
   | 'GAME_ENDED' // 游戏结束
-  | 'GAME_LEVEL_UP'; // 游戏关卡升级
+  | 'GAME_LEVEL_UP' // 游戏关卡升级
+  | 'COMPLETE_WATCH_ADS'; // 完成观看广告
 export type TaskPoint = {
   event: TaskEvent;
   params?: Record<string, unknown>;

package/src/h5/api/runtime.ts

@@ -7,7 +7,7 @@ const commands = createCommands();
 
 commands.registerCommand('RuntimeSDK.loadFinishedEvent', () => {
   const duration = performance.now();
-  notifyCustomEvent('CP_LOAD_FINISH', {});
+  notifyCustomEvent('CP_LOAD_FINISH', { duration });
   track('loadFinished', {
     duration
   });

package/src/native/api/rewards.ts

@@ -1,9 +1,76 @@
 import { BaseError, wrapUserFunction, createCommands } from '@jolibox/common';
-import { canIUseNative, createAPI, registerCanIUse, t } from './base';
+import { canIUseNative, createAPI, createSyncAPI, registerCanIUse, t } from './base';
 import { StandardResponse, ICoinDetailsData } from '@jolibox/types';
 import { context } from '@/common/context';
 import { createAPIError } from '@/common/report/errors';
 import { invokeNative } from '@jolibox/native-bridge';
+import { IAdsContext } from '@jolibox/ads/dist/type/base';
+import { adEventEmitter } from '@/common/ads';
+import { taskTracker, track } from '../report';
+import { JoliboxAdsForGame } from '@jolibox/ads';
+import { innerFetch as fetch } from '../network';
+
+const checkNetworkStatus = () => {
+  const { data } = invokeNative('getNetworkStatusSync');
+  return !!data?.isConnected;
+};
+
+const httpClient = {
+  get: <T>(url: string, options?: any) =>
+    fetch<T>(url, {
+      method: 'GET',
+      responseType: 'json',
+      appendHostCookie: true,
+      ...options
+    }).then((res) => res.response.data as T),
+  post: <T>(url: string, options?: any) =>
+    fetch<T>(url, {
+      method: 'POST',
+      responseType: 'json',
+      appendHostCookie: true,
+      ...options
+    }).then((res) => res.response.data as T)
+};
+
+const adsContext: IAdsContext<'TASK'> = {
+  httpClient,
+  checkNetwork: checkNetworkStatus,
+  track,
+  eventEmitter: adEventEmitter,
+  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',
+      deviceId: context.deviceInfo.did ?? '',
+      adId: context.deviceInfo.adId ?? '',
+      sessionId: context.sessionId ?? '',
+      userId: context.hostUserInfo?.uid ?? '',
+      objectType: 'TASK',
+      objectId: context.mpId,
+      testAdsMode: context.testAdsMode,
+      channel: context.joliSource ?? '',
+      deviceBrand: context.deviceInfo.brand,
+      deviceModel: context.deviceInfo.model,
+      osType: context.platform === 'android' ? 'ANDROID' : context.platform === 'ios' ? 'IOS' : 'PC',
+      runtimeType: 'APP',
+      platform: 1000, // WebSDK
+      joliSource: context.joliSource ?? '',
+      deviceInfo: {
+        platform: context.platform,
+        nativeSDKVersionCode: context.sdkInfo.nativeSDKVersionCode ?? 0
+      }
+    };
+  }
+};
+
+// const ads = new JoliboxAdsForGame(adsContext);
 
 const commands = createCommands();
 
@@ -83,3 +150,86 @@ commands.registerCommand('RewardsSDK.getCoinDetails', getCoinDetails);
 registerCanIUse('rewards.getCoinDetails', {
   version: '1.3.2'
 });
+
+const createRewardsAdsManager = createAPI('createRewardsAdsManager', {
+  implement: async () => {
+    try {
+      const ads = new JoliboxAdsForGame(adsContext);
+      if (context.mpType !== 'miniApp') {
+        throw createAPIError({
+          code: -1,
+          msg: '[JoliboxSDK]: createRewardsAdsManager not supported in games. Only supported in mini apps.'
+        });
+      }
+      return {
+        code: 'SUCCESS',
+        message: 'Successfully created RewardsAdsManager',
+        data: {
+          init: async () => {
+            await ads.init();
+            ads.adConfig({
+              preloadAdBreaks: 'on',
+              sound: 'off',
+              onReady: () => {
+                // do nothing
+              }
+            });
+          },
+          showAd: async (callbacks: {
+            onAdLoaded?: () => void;
+            onAdError?: (error: Error) => void;
+            onAdRewarded?: () => void;
+            onAdDismissed?: () => void;
+          }) => {
+            ads.adBreak({
+              type: 'reward',
+              beforeReward: (showAdFn) => {
+                showAdFn();
+                callbacks.onAdLoaded?.();
+              },
+              adDismissed: () => {
+                // do nothing
+                callbacks.onAdDismissed?.();
+              },
+              adViewed: () => {
+                // do nothing
+              },
+              adBreakDone: (placementInfo) => {
+                const breakStatus = placementInfo.breakStatus;
+                const noAdPreloaded =
+                  breakStatus === 'frequencyCapped' ||
+                  breakStatus === 'other' ||
+                  breakStatus === 'error' ||
+                  breakStatus === 'noAdPreloaded';
+                if (breakStatus === 'viewed') {
+                  // reward should be given to user
+                  console.log('-----> complete watch ads');
+                  taskTracker.reporter({
+                    event: 'COMPLETE_WATCH_ADS'
+                  });
+                  callbacks.onAdRewarded?.();
+                }
+
+                if (noAdPreloaded) {
+                  console.log('-----> no ad preloaded or error occurred', breakStatus);
+                  callbacks.onAdError?.(new Error('No ad preloaded or error occurred: ' + breakStatus));
+                }
+              }
+            });
+          }
+        }
+      };
+    } catch (error) {
+      return {
+        code: 'FAILURE',
+        message: '[JoliboxSDK]: Failed to create RewardsAdsManager'
+      };
+    }
+  }
+});
+
+commands.registerCommand('Rewards.createRewardsAdsManager', createRewardsAdsManager);
+
+registerCanIUse('rewards.createRewardsAdsManager', {
+  version: '1.3.4'
+});

package/src/native/bootstrap/index.ts

@@ -76,7 +76,7 @@ RuntimeLoader.onReady(() => {
 function addShowAdListener() {
   adEventEmitter.on('isAdShowing', (isShowing) => {
     isAdShowing = isShowing;
-    if (isBoolean(isAdShowing)) {
+    if (isBoolean(isAdShowing) && context.mpType === 'game') {
       invokeNative('updateContainerConfigSync', {
         displayCapsuleButton: !isAdShowing,
         webviewId: context.webviewId