@jolibox/implement 1.1.19-beta.6 → 1.1.20-beta.1

package/implement.build.log

@@ -1,9 +1,9 @@
 Invoking: npm run clean && npm run build:esm && tsc 
 
-> @jolibox/implement@1.1.19-beta.6 clean
+> @jolibox/implement@1.1.20-beta.1 clean
 > rimraf ./dist
 
 
-> @jolibox/implement@1.1.19-beta.6 build:esm
+> @jolibox/implement@1.1.20-beta.1 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.19-beta.6",
+  "version": "1.1.20-beta.1",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "license": "MIT",
   "dependencies": {
-    "@jolibox/common": "1.1.19-beta.6",
-    "@jolibox/types": "1.1.19-beta.6",
-    "@jolibox/native-bridge": "1.1.19-beta.6",
-    "@jolibox/ads": "1.1.19-beta.6",
+    "@jolibox/common": "1.1.20-beta.1",
+    "@jolibox/types": "1.1.20-beta.1",
+    "@jolibox/native-bridge": "1.1.20-beta.1",
+    "@jolibox/ads": "1.1.20-beta.1",
     "localforage": "1.10.0",
     "@jolibox/ui": "1.0.0",
     "web-vitals": "4.2.4"

package/src/common/context/index.ts

@@ -1,4 +1,4 @@
-import { mergeArray, mergeWith } from '@jolibox/common';
+import { getAdvertisingId, mergeArray, mergeWith } from '@jolibox/common';
 import { DeviceInfo, HostInfo, HostUserInfo, SdkInfo } from './types';
 import { Env } from '@jolibox/types';
 import { parseUrlQuery, encodeJoliSourceQuery, QueryParams } from './url-parse';
@@ -16,6 +16,7 @@ const defaultEnv: Env = {
     brand: 'UnknownBrand',
     model: 'UnknownModel',
     did: getDeviceId(),
+    adId: getAdvertisingId(),
     pixelRatio: window.devicePixelRatio || 1,
     platform: platform.isAndroid ? 'android' : platform.isiOS ? 'ios' : 'h5',
     system: 'UnknownSystemVersion',
@@ -108,6 +109,9 @@ const wrapContext = () => {
     get baseApiHost(): string {
       return testMode ? 'https://stg-api.jolibox.com' : 'https://api.jolibox.com';
     },
+    get adId(): string {
+      return env.deviceInfo.adId ?? env.deviceInfo.did;
+    },
     onEnvConfigChanged: (newConfig: Partial<Env>) => {
       mergeWith(env, newConfig, mergeArray);
     },

package/src/common/rewards/registers/utils/coins/index.ts

@@ -181,6 +181,8 @@ export const createCommonJolicoinRewardHandler = (
       }
       handleUnlockFailed?.(params);
       return false;
+    } finally {
+      unlockOptionsHandler.clearCache();
     }
   };
 };

package/src/h5/api/ads.ts

@@ -29,7 +29,7 @@ const adsContext: IAdsContext<'GAME'> = {
     return {
       hostAppId: context.hostInfo?.aid ?? '1',
       deviceId: context.deviceInfo.did ?? '',
-      adId: context.deviceInfo.did ?? '', //TODO: @Deng Xue
+      adId: context.deviceInfo.adId ?? '',
       sessionId: context.sessionId ?? '',
       userId: context.hostUserInfo?.uid ?? '',
       objectType: 'GAME',

package/src/h5/rewards/index.ts

@@ -24,7 +24,7 @@ const UseCoinEventMap: Record<string, IUseModalResultEvent['useModalResult']> =
   CANCEL: 'CANCEL'
 };
 onCustomEvent('ON_JOLIBOX_JOLI_COIN_USE_RESULT', (data) => {
-  console.log('onCustomEvent ON_JOLIBOX_JOLI_COIN_USE_RESULT', UseCoinEventMap[data.result]);
+  console.log('onCustomEvent ON_JOLIBOX_JOLI_COIN_USE_RESULT', UseCoinEventMap[data.result], data.result);
 
   rewardsEmitter.emit(UseModalResultEventName, {
     useModalResult: UseCoinEventMap[data.result]

package/src/native/api/ads.ts

@@ -25,6 +25,7 @@ import {
   createJolicoinRewardHandler,
   createJolicoinOnlyRewardHandler
 } from '@/common/rewards';
+import { adEventEmitter } from '@/common/ads';
 
 const checkNetworkStatus = () => {
   const { data } = invokeNative('getNetworkStatusSync');
@@ -52,11 +53,12 @@ const adsContext: IAdsContext<'GAME'> = {
   httpClient,
   checkNetwork: checkNetworkStatus,
   track,
+  eventEmitter: adEventEmitter,
   getContextInfo: () => {
     return {
       hostAppId: context.hostInfo?.aid ?? '1',
       deviceId: context.deviceInfo.did ?? '',
-      adId: context.deviceInfo.did ?? '', //TODO: @Deng Xue
+      adId: context.deviceInfo.adId ?? '',
       sessionId: context.sessionId ?? '',
       userId: context.hostUserInfo?.uid ?? '',
       objectType: 'GAME',

package/src/native/api/navigate.ts

@@ -48,6 +48,8 @@ const interceptSystemExitSync = createSyncAPI('interceptSystemExitSync', {
   paramsSchema: t.tuple(t.boolean()),
   implement: (intercept) => {
     hostEmitter.emit('onInterceptSystemExit', { intercept });
+    // 同步拦截物理退出
+    hostEmitter.emit('onInterceptBackPress', { intercept });
   }
 });
 

package/src/native/bootstrap/index.ts

@@ -17,6 +17,7 @@ declare const globalThis: {
     doExit: (uuid: string) => void;
     onDocumentReady: (path: string) => void;
     env: (params: { onError: (error: Error) => void }) => Env | undefined;
+    doBackPress: (uuid: string) => void;
   };
 };
 
@@ -47,6 +48,11 @@ let baskcMeta: IBasicMetaConfig | null = null;
  */
 let isInterceptSystemExit = false;
 
+/**
+ * android全局拦截物理按键
+ */
+let isInterceptBackPress = false;
+
 RuntimeLoader.onReady(() => {
   // TODO: merge some env config
 });
@@ -75,6 +81,20 @@ function addInterceptSystemExitListener() {
   });
 }
 
+/**
+ * android 全局拦截物理退出
+ */
+function addBackPressListener() {
+  hostEmitter.on('onInterceptBackPress', ({ intercept }) => {
+    isInterceptBackPress = intercept;
+  });
+
+  onNative('onBeforeBackPress', ({ uuid }) => {
+    hostEmitter.emit('onBackPress', {});
+    globalThis.joliboxJSCore?.doBackPress?.(uuid);
+  });
+}
+
 /**
  * The DOMContentLoaded event might be triggered very early,
  * so the global loaded listener should be executed during the bootstrap process.
@@ -172,6 +192,13 @@ function addDoExitLoader() {
     doActualExit();
     return false;
   });
+
+  RuntimeLoader.onDoBackPress(async () => {
+    if (shouldInterceptSystemExit()) {
+      return true; // Forbid exit on watching ads
+    }
+    return false;
+  });
 }
 
 async function fetchMetaConfig() {
@@ -190,6 +217,7 @@ export function config(): void {
   addGameServiceReadyListener();
   addShowAdListener();
   addInterceptSystemExitListener();
+  addBackPressListener();
   addDoExitLoader();
   addWebviewReadyListener();
   addI18nChangedListener();