@jolibox/implement 1.3.3-beta.1 → 1.3.3

package/dist/native/api/base.d.ts

@@ -10,6 +10,6 @@ export declare const createAPI: <ParamsSchema extends import("@/common/api-facto
 }) => (...inputs: Inputs) => import("@jolibox/types").StandardResponse<Return>;
 export declare const registerCanIUse: (name: string, config: import("@jolibox/common").CanIUseInfo) => void;
 import { t } from '@/common/api-factory/validator';
+export { canIUseNative } from '@/native/utils/can-iuse-native';
 export { t };
-export declare const canIUseNative: (schema: string) => boolean;
 export { convertVersionCodeToVString } from './utils';

package/dist/native/report/task-tracker.d.ts

@@ -20,5 +20,6 @@ export declare class NativeTaskTracker extends TaskTracker {
     tracker(event: TrackEvent, info?: Record<string, unknown> | null): void;
     start(duration?: number): void;
     private tryReportOpenGamePlus;
+    private createTask;
 }
 export {};

package/dist/native/utils/can-iuse-native.d.ts

@@ -0,0 +1 @@
+export declare const canIUseNative: (schema: string) => boolean;

package/implement.build.log

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

package/src/h5/report/encrypt/index.ts

@@ -0,0 +1,102 @@
+import { PUBLIC_KEY_PEM } from './public';
+
+function arrayBufferToBase64(buffer: ArrayBuffer) {
+  let binary = '';
+  const bytes = new Uint8Array(buffer);
+  const len = bytes.byteLength;
+  for (let i = 0; i < len; i++) {
+    binary += String.fromCharCode(bytes[i]);
+  }
+  return window.btoa(binary);
+}
+
+function importPublicKeyFromString(pem: string) {
+  const pemHeader = '-----BEGIN PUBLIC KEY-----';
+  const pemFooter = '-----END PUBLIC KEY-----';
+  const pemContents = pem
+    .substring(pem.indexOf(pemHeader) + pemHeader.length, pem.indexOf(pemFooter))
+    .replace(/\s+/g, '');
+
+  const binaryDerString = window.atob(pemContents);
+  const binaryDer = new Uint8Array(binaryDerString.length);
+  for (let i = 0; i < binaryDerString.length; i++) {
+    binaryDer[i] = binaryDerString.charCodeAt(i);
+  }
+
+  return binaryDer.buffer;
+}
+
+interface ReportBody {
+  eventType: string;
+  gameInfo: {
+    gameId: string;
+    sessionId: string;
+  };
+}
+
+export async function generateEncryptedPayload(payload: ReportBody) {
+  const crypto = window.crypto;
+  const subtle = crypto.subtle;
+
+  const keyBuffer = importPublicKeyFromString(PUBLIC_KEY_PEM);
+
+  const publicKey = await subtle.importKey(
+    'spki',
+    keyBuffer,
+    {
+      name: 'RSA-OAEP',
+      hash: 'SHA-1'
+    },
+    false,
+    ['encrypt']
+  );
+
+  const aesKeyRaw = crypto.getRandomValues(new Uint8Array(32));
+  const aesKeyObj = await subtle.importKey('raw', aesKeyRaw, 'AES-GCM', false, ['encrypt']);
+
+  const encryptedAesKeyBuffer = await subtle.encrypt(
+    {
+      name: 'RSA-OAEP'
+    },
+    publicKey,
+    aesKeyRaw
+  );
+
+  const k = arrayBufferToBase64(encryptedAesKeyBuffer);
+
+  const timestamp = Date.now();
+  const payloadJson = {
+    timestamp,
+    data: payload
+  };
+
+  const encoder = new TextEncoder();
+  const payloadBytes = encoder.encode(JSON.stringify(payloadJson));
+
+  const iv = crypto.getRandomValues(new Uint8Array(12));
+
+  const ciphertextWithTagBuffer = await subtle.encrypt(
+    {
+      name: 'AES-GCM',
+      iv: iv,
+      tagLength: 128
+    },
+    aesKeyObj,
+    payloadBytes
+  );
+
+  const ciphertextWithTag = new Uint8Array(ciphertextWithTagBuffer);
+  const finalPayloadBuffer = new Uint8Array(iv.length + ciphertextWithTag.length);
+
+  finalPayloadBuffer.set(iv, 0); // 先放 IV
+  finalPayloadBuffer.set(ciphertextWithTag, iv.length); // 再放 Ciphertext + Tag
+
+  const encryptedPayload = arrayBufferToBase64(finalPayloadBuffer.buffer);
+  const data = {
+    k: k,
+    v: '1.0',
+    payload: encryptedPayload
+  };
+
+  return data;
+}

package/src/h5/report/encrypt/public.ts

@@ -0,0 +1,9 @@
+export const PUBLIC_KEY_PEM = `-----BEGIN PUBLIC KEY-----
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAs29BUZPZdQwNDEYtXufp
+IGF40RBoddFzoD2ixl6PjyKWFXF8kxGS++HNtLspxhLvWoE12IZvrP7+whSpgHcy
+4ryuW86mOdHnP9iyeK69GosHz3lVhQjF9UdhJDXB7P/zdj3VlVzZIj0yL+YvZjO0
+F9vHrK8GMr1/gf3HKAroVJUVmJlWjqhBGoQzb58mqbTSWSN0HkDdYwXHNh/Xc1le
+DJDbBmfKOQdlBjABR9gb1wGz2LPFA40kzROV9mMiVePXpCOKNMy+b0UOW4RoF7pi
+Rq0jHJ4fRrMWvf/GugT0mv8YyuU9DaXLqTGP+jOEVvzvgtkO84XtLW1vh5ggINPW
+2wIDAQAB
+-----END PUBLIC KEY-----`;

package/src/h5/report/task-tracker.ts

@@ -8,6 +8,7 @@ import { EventEmitter, logger } from '@jolibox/common';
 import { httpClientManager } from '../http';
 import type { Track } from '.';
 import type { TrackEvent } from '@jolibox/types';
+import { generateEncryptedPayload } from './encrypt';
 
 export class H5TaskTracker extends TaskTracker {
   private gameId: string;
@@ -35,9 +36,17 @@ export class H5TaskTracker extends TaskTracker {
     if (extraParams) {
       Object.assign(reportBody, extraParams);
     }
-    await this.httpClient.post(`/api/base/app-event`, {
-      data: reportBody
-    });
+
+    try {
+      const encryptedBody = await generateEncryptedPayload(reportBody);
+      await this.httpClient.post(`/api/base/app-event/v2`, {
+        data: encryptedBody
+      });
+    } catch (e) {
+      await this.httpClient.post(`/api/base/app-event`, {
+        data: reportBody
+      });
+    }
   }
   tracker(event: TrackEvent, info: Record<string, unknown> | null = null) {
     this.track(event, info);

package/src/native/api/base.ts

@@ -5,12 +5,7 @@ export const { createAPI, createSyncAPI } = createAPIFactory(track);
 
 export const registerCanIUse = registerCanIUseFactory('native');
 import { t } from '@/common/api-factory/validator';
-import { registerCanIUseContext } from '@jolibox/native-bridge';
-import { context } from '@/common/context';
+export { canIUseNative } from '@/native/utils/can-iuse-native';
 export { t };
 
-export const { canIUseNative } = registerCanIUseContext(
-  () => context.sdkInfo.nativeSDKVersionCode,
-  () => context.platform
-);
 export { convertVersionCodeToVString } from './utils';

package/src/native/api/rewards.ts

@@ -1,4 +1,4 @@
-import { BaseError, createCommands, wrapUserFunction } from '@jolibox/common';
+import { BaseError, wrapUserFunction, createCommands } from '@jolibox/common';
 import { canIUseNative, createAPI, registerCanIUse, t } from './base';
 import { StandardResponse, ICoinDetailsData } from '@jolibox/types';
 import { context } from '@/common/context';
@@ -10,12 +10,10 @@ const commands = createCommands();
 const safeCallbackWrapper = wrapUserFunction(reportError as (err: Error | BaseError) => void);
 
 const getCoinDetails = createAPI('getCoinDetails', {
-  paramsSchema: t.tuple(t.object({ onUpdate: t.function().optional() })),
-  implement: async ({
-    onUpdate
-  }: {
-    onUpdate?: (data: ICoinDetailsData) => void | Promise<void>;
-  }): Promise<StandardResponse<ICoinDetailsData>> => {
+  paramsSchema: t.tuple(t.function().optional()),
+  implement: async (
+    onUpdate?: (data: ICoinDetailsData) => void | Promise<void>
+  ): Promise<StandardResponse<ICoinDetailsData>> => {
     try {
       const currentType = context.mpType;
       // check mp type
@@ -58,10 +56,12 @@ const getCoinDetails = createAPI('getCoinDetails', {
           msg: errMsg
         });
       }
+      console.log('=====> sync data', data, errNo);
 
       invokeNative('requestCoinDetailsAsync').then((res) => {
         if (res.errNo == 0 && res.data) {
           customOnUpdate(res.data);
+          console.log('=====> res.data', res.data);
         }
       });
       return {

package/src/native/report/task-tracker.ts

@@ -9,6 +9,7 @@ import { applyNative } from '@jolibox/native-bridge';
 import type { Track } from '.';
 import type { TrackEvent } from '@jolibox/types';
 import { getGlobalStorage, setGlobalStorage } from '../api/storage';
+import { canIUseNative } from '@/native/utils/can-iuse-native';
 
 const REPORT_FIRST_OPEN_GAME = 'REPORT_FIRST_OPEN_GAME';
 
@@ -55,16 +56,7 @@ export class NativeTaskTracker extends TaskTracker {
       Object.assign(reportBody, extraParams);
     }
 
-    const reportTask =
-      context.platform === 'android'
-        ? fetch(`/api/base/app-event`, {
-            method: 'POST',
-            data: reportBody
-          })
-        : applyNative('trackAppEventAsync', {
-            url: this.taskUrl,
-            body: JSON.stringify(reportBody)
-          });
+    const reportTask = this.createTask(reportBody);
     await reportTask;
   }
 
@@ -96,4 +88,27 @@ export class NativeTaskTracker extends TaskTracker {
       setGlobalStorage(REPORT_FIRST_OPEN_GAME, true);
     });
   }
+
+  private createTask(reportBody: {
+    eventType: string;
+    gameInfo: {
+      gameId: string;
+      sessionId: string;
+    };
+  }) {
+    if (canIUseNative('sendServerEventAsync')) {
+      return applyNative('sendServerEventAsync', {
+        payload: reportBody
+      });
+    }
+    return context.platform === 'android'
+      ? fetch(`/api/base/app-event`, {
+          method: 'POST',
+          data: reportBody
+        })
+      : applyNative('trackAppEventAsync', {
+          url: this.taskUrl,
+          body: JSON.stringify(reportBody)
+        });
+  }
 }

package/src/native/utils/can-iuse-native.ts

@@ -0,0 +1,7 @@
+import { context } from '@/common/context';
+import { registerCanIUseContext } from '@jolibox/native-bridge';
+
+export const { canIUseNative } = registerCanIUseContext(
+  () => context.sdkInfo.nativeSDKVersionCode,
+  () => context.platform
+);