@jolibox/implement 1.3.5 → 1.3.6

package/implement.build.log

@@ -1,9 +1,9 @@
 Invoking: npm run clean && npm run build:esm && tsc 
 
-> @jolibox/implement@1.3.5 clean
+> @jolibox/implement@1.3.6 clean
 > rimraf ./dist
 
 
-> @jolibox/implement@1.3.5 build:esm
+> @jolibox/implement@1.3.6 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",
+  "version": "1.3.6",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "license": "MIT",
   "dependencies": {
-    "@jolibox/common": "1.3.5",
-    "@jolibox/types": "1.3.5",
-    "@jolibox/native-bridge": "1.3.5",
-    "@jolibox/ads": "1.3.5",
+    "@jolibox/common": "1.3.6",
+    "@jolibox/types": "1.3.6",
+    "@jolibox/native-bridge": "1.3.6",
+    "@jolibox/ads": "1.3.6",
     "localforage": "1.10.0",
-    "@jolibox/ui": "1.3.5",
+    "@jolibox/ui": "1.3.6",
     "web-vitals": "4.2.4"
   },
   "devDependencies": {
@@ -20,7 +20,7 @@
     "@types/node": "18.0.0",
     "rimraf": "6.0.1",
     "esbuild": "0.24.2",
-    "@jolibox/eslint-config": "1.0.1-beta.16"
+    "@jolibox/eslint-config": "1.0.1-beta.19"
   },
   "scripts": {
     "clean": "rimraf ./dist",

package/src/common/report/base-tracker.ts

@@ -81,6 +81,7 @@ export abstract class EventTracker {
     const location = event.location ? event.location : await this.getLocation();
     const target = event.target || null;
     const extra = event.extra || null;
+    const { hostUserInfo } = context;
     if (!this.deviceInfo) {
       this.deviceInfo = await this.getDevice();
     }
@@ -92,7 +93,7 @@ export abstract class EventTracker {
         target,
         extra,
         timestamp: Date.now(),
-        userId: null
+        userId: hostUserInfo?.uid ?? null
       }
     ];
     const eventPackage: IEventPackage = {

package/src/common/utils/index.ts

@@ -120,6 +120,7 @@ interface ReceivedJoliboxCustomEvent {
   [ON_GET_USER_SUB_STATUS]: {
     sequenceId: string;
     isSubUser: boolean;
+    userId?: string;
   };
   [ON_JOLIBOX_SUB_RESULT_EVENT]: {
     sequenceId: string;

package/src/h5/bootstrap/auth/__tests__/auth.test.ts

@@ -30,6 +30,7 @@ import { getUserSubStatus, resetSubState } from '../sub';
 interface EventData {
   sequenceId: string;
   isSubUser: boolean;
+  userId?: string;
 }
 
 describe('getUserSubStatus', () => {
@@ -68,12 +69,13 @@ describe('getUserSubStatus', () => {
     if (eventHandler) {
       (eventHandler as any)({
         sequenceId: 'test-sequence-id',
-        isSubUser: true
+        isSubUser: true,
+        userId: 'user-123'
       });
     }
 
     const result = await promise;
-    expect(result).toBe(true);
+    expect(result).toEqual({ isSubUser: true, userId: 'user-123' });
   });
 
   it('should resolve with false when isSubUser is false', async () => {
@@ -98,7 +100,7 @@ describe('getUserSubStatus', () => {
     }
 
     const result = await promise;
-    expect(result).toBe(false);
+    expect(result).toEqual({ isSubUser: false, userId: undefined });
   });
 
   it('should reject on timeout', async () => {
@@ -144,13 +146,13 @@ describe('getUserSubStatus', () => {
 
     // Simulate responses with different sequence IDs
     if (eventHandler) {
-      (eventHandler as any)({ sequenceId: 'uuid-1', isSubUser: true });
+      (eventHandler as any)({ sequenceId: 'uuid-1', isSubUser: true, userId: 'user-1' });
       (eventHandler as any)({ sequenceId: 'uuid-2', isSubUser: false });
     }
 
     const [result1, result2] = await Promise.all([promise1, promise2]);
-    expect(result1).toBe(true);
-    expect(result2).toBe(false);
+    expect(result1).toEqual({ isSubUser: true, userId: 'user-1' });
+    expect(result2).toEqual({ isSubUser: false, userId: undefined });
   });
 
   it('should ignore responses with different sequenceId', async () => {
@@ -170,7 +172,8 @@ describe('getUserSubStatus', () => {
     if (eventHandler) {
       (eventHandler as any)({
         sequenceId: 'wrong-sequence-id',
-        isSubUser: true
+        isSubUser: true,
+        userId: 'user-wrong'
       });
     }
 
@@ -194,12 +197,13 @@ describe('getUserSubStatus', () => {
     if (eventHandler) {
       (eventHandler as any)({
         sequenceId: 'correct-sequence-id',
-        isSubUser: true
+        isSubUser: true,
+        userId: 'user-correct'
       });
     }
 
     await promise;
-    expect(promiseResult).toBe(true);
+    expect(promiseResult).toEqual({ isSubUser: true, userId: 'user-correct' });
   });
 
   it('should handle multiple concurrent requests with different sequenceIds', async () => {
@@ -239,14 +243,14 @@ describe('getUserSubStatus', () => {
     // Simulate responses in reverse order
     if (eventHandler) {
       (eventHandler as any)({ sequenceId: 'request-3', isSubUser: false });
-      (eventHandler as any)({ sequenceId: 'request-1', isSubUser: true });
-      (eventHandler as any)({ sequenceId: 'request-2', isSubUser: true });
+      (eventHandler as any)({ sequenceId: 'request-1', isSubUser: true, userId: 'user-1' });
+      (eventHandler as any)({ sequenceId: 'request-2', isSubUser: true, userId: 'user-2' });
     }
 
     const [result1, result2, result3] = await Promise.all([promise1, promise2, promise3]);
-    expect(result1).toBe(true);
-    expect(result2).toBe(true);
-    expect(result3).toBe(false);
+    expect(result1).toEqual({ isSubUser: true, userId: 'user-1' });
+    expect(result2).toEqual({ isSubUser: true, userId: 'user-2' });
+    expect(result3).toEqual({ isSubUser: false, userId: undefined });
   });
 
   it('should clean up timeout when response is received', async () => {
@@ -269,7 +273,8 @@ describe('getUserSubStatus', () => {
     if (eventHandler) {
       (eventHandler as any)({
         sequenceId: 'cleanup-test-id',
-        isSubUser: true
+        isSubUser: true,
+        userId: 'user-cleanup'
       });
     }
 
@@ -305,7 +310,8 @@ describe('getUserSubStatus', () => {
     if (eventHandler) {
       (eventHandler as any)({
         sequenceId: 'late-response-id',
-        isSubUser: true
+        isSubUser: true,
+        userId: 'user-late'
       });
     }
 

package/src/h5/bootstrap/auth/sub.ts

@@ -2,7 +2,7 @@ import { onCustomEvent, notifyCustomEvent } from '@/common/utils';
 import { uuidv4 as v4 } from '@jolibox/common';
 // global event listener manager
 interface PendingRequest {
-  resolve: (value: boolean) => void;
+  resolve: (value: { isSubUser: boolean; userId?: string }) => void;
   reject: (error: Error) => void;
   timeoutId: NodeJS.Timeout;
 }
@@ -18,7 +18,11 @@ const initializeEventListener = () => {
     const pendingRequest = pendingRequests.get(data.sequenceId);
     if (pendingRequest) {
       clearTimeout(pendingRequest.timeoutId);
-      pendingRequest.resolve(data.isSubUser);
+      const { isSubUser, userId } = data;
+      pendingRequest.resolve({
+        isSubUser,
+        userId
+      });
       pendingRequests.delete(data.sequenceId);
     }
   });
@@ -32,7 +36,7 @@ export const resetSubState = () => {
   pendingRequests.clear();
 };
 
-export async function getUserSubStatus(): Promise<boolean> {
+export async function getUserSubStatus(): Promise<{ isSubUser: boolean; userId?: string }> {
   initializeEventListener();
 
   return new Promise((resolve, reject) => {

package/src/h5/bootstrap/index.ts

@@ -33,8 +33,11 @@ function trackPerformance() {
 function addDomContentLoaded() {
   hostEmitter.on('onDocumentReady', async (startTime: number) => {
     const isLogin = await checkSession();
-    const isSubUser = await getUserSubStatus().catch(() => false);
-    context.onEnvConfigChanged({ hostUserInfo: { isLogin, isSubUser } });
+    const { isSubUser, userId } = await getUserSubStatus().catch(() => ({
+      isSubUser: false,
+      userId: undefined
+    }));
+    context.onEnvConfigChanged({ hostUserInfo: { isLogin, isSubUser, uid: userId } });
     hostEmitter.emit('LifecycleEvent.onReady', {
       ...(context.hostUserInfo ? context.hostUserInfo : { isLogin: false })
     });

package/src/native/subscription/registers/sub-app.ts

@@ -32,7 +32,7 @@ export interface ISubAppSubscriptionContext {
 onNative('onGlobalSubscriptionStateChange', (data) => {
   const { status, orderResponse } = data;
   console.log('[onGlobalSubscriptionStateChange] data', data);
-  if (status === 'SUCCESS' && (orderResponse?.subPlanId || orderResponse?.tickedId)) {
+  if (status === 'SUCCESS' && (orderResponse?.subPlanId || orderResponse?.ticketId)) {
     // user must be logined
     context.onEnvConfigChanged({
       hostUserInfo: {
@@ -58,7 +58,7 @@ onNative('onSubscritptionStateChange', (data) => {
     deferred.resolve({
       code: 'SUCCESS' as ResponseType,
       message: 'jolicoin payment success',
-      data: { subPlanId: orderResponse?.subPlanId ?? orderResponse.tickedId }
+      data: { subPlanId: orderResponse?.subPlanId ?? orderResponse.ticketId }
     });
   } else {
     if (status === 'FAILED') {