@jolibox/implement 1.1.53 → 1.1.54

package/implement.build.log

@@ -1,9 +1,9 @@
 Invoking: npm run clean && npm run build:esm && tsc 
 
-> @jolibox/implement@1.1.53 clean
+> @jolibox/implement@1.1.54 clean
 > rimraf ./dist
 
 
-> @jolibox/implement@1.1.53 build:esm
+> @jolibox/implement@1.1.54 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.53",
+  "version": "1.1.54",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "license": "MIT",
   "dependencies": {
-    "@jolibox/common": "1.1.53",
-    "@jolibox/types": "1.1.53",
-    "@jolibox/native-bridge": "1.1.53",
-    "@jolibox/ads": "1.1.53",
+    "@jolibox/common": "1.1.54",
+    "@jolibox/types": "1.1.54",
+    "@jolibox/native-bridge": "1.1.54",
+    "@jolibox/ads": "1.1.54",
     "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 { getAdvertisingId, mergeArray, mergeWith } from '@jolibox/common';
+import { getAdvertisingId, mergeArray, mergeWith, getApiDomain } from '@jolibox/common';
 import { DeviceInfo, HostInfo, HostUserInfo, SdkInfo } from './types';
 import { Env } from '@jolibox/types';
 import { parseUrlQuery, encodeJoliSourceQuery, QueryParams } from './url-parse';
@@ -130,7 +130,7 @@ const wrapContext = () => {
       return payloadJson?.__from;
     },
     get baseApiHost(): string {
-      return testMode ? 'https://stg-api.jolibox.com' : 'https://api.jolibox.com';
+      return getApiDomain(testMode);
     },
     get adId(): string {
       return env.deviceInfo.adId ?? env.deviceInfo.did;

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

@@ -1,5 +1,5 @@
 import { context } from '@/common/context';
-import { logger } from '@jolibox/common';
+import { logger, getApiHost } from '@jolibox/common';
 import { IDevice, IPage, IEventPackage, IEvent, EProject, serializeEventPackage } from '@jolibox/common';
 
 interface ISamplesConfig {
@@ -27,7 +27,7 @@ export abstract class EventTracker {
   }
 
   private async fetchSamplesConfig() {
-    const host = context.testMode ? 'https://stg-api.jolibox.com' : 'https://api.jolibox.com';
+    const host = getApiHost(context.testMode);
     const path = `${host}/api/fe-configs/js-sdk/samples-config`;
     const samplesConfig = (await (await fetch(path)).json()) as ISamplesConfig;
     this.samplesConfig = samplesConfig;

package/src/h5/api/storage.ts

@@ -1,5 +1,5 @@
 import { createAPI, t, registerCanIUse } from './base';
-import { createCommands } from '@jolibox/common';
+import { createCommands, getApiHost } from '@jolibox/common';
 import { httpClientManager } from '@/h5/http';
 import { context } from '@/common/context';
 import { StorageResponse } from '@jolibox/types';
@@ -10,7 +10,7 @@ const commands = createCommands();
 export class JoliboxCloudStorage {
   private gameId: string;
   private httpClient = httpClientManager.create({
-    baseUrl: context.testMode ? 'https://stg-api.jolibox.com' : 'https://api.jolibox.com'
+    baseUrl: getApiHost(context.testMode)
   });
   private gameStore: LocalForage;
   constructor() {

package/src/h5/http/index.ts

@@ -1,7 +1,7 @@
 import { IHttpClient } from '@/common/http';
 import { xUserAgent } from '../../common/http/xua';
 import { context } from '@/common/context';
-import { platform } from '@jolibox/common';
+import { getApiHost, platform } from '@jolibox/common';
 
 declare global {
   interface Window {
@@ -68,7 +68,7 @@ export class JoliboxHttpClient implements IHttpClient {
   };
 
   constructor(config?: IHttpClientInitParams) {
-    const defaultUrl = context.testMode ? 'https://stg-api.jolibox.com' : 'https://api.jolibox.com';
+    const defaultUrl = getApiHost(context.testMode);
     this.baseUrl = config?.baseUrl ?? defaultUrl;
   }
 

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

@@ -1,26 +1,11 @@
 import { context } from '@/common/context';
 import { EventTracker } from '@/common/report';
 import { httpClientManager } from '@/h5/http';
+import { getCollectHost } from '@jolibox/common';
 
 export class H5EventTracker extends EventTracker {
-  private hostToApiMap: Record<string | 'default', { test: string; prod: string }> = {
-    default: {
-      test: 'https://stg-collect.jolibox.com',
-      prod: 'https://collect.jolibox.com'
-    },
-    'oss.jolibox.com': {
-      test: 'https://stg-collect.jolibox.com',
-      prod: 'https://collect.jolibox.com'
-    },
-    'oss.pico-game.com': {
-      test: 'https://stg-collect.pico-game.com',
-      prod: 'https://collect.pico-game.com'
-    }
-  };
-
   private get apiBaseURL() {
-    const api = this.hostToApiMap[window.location.host] ?? this.hostToApiMap.default;
-    return context.testMode ?? false ? api.test : api.prod;
+    return getCollectHost(context.testMode ?? false);
   }
 
   private httpClient = httpClientManager.create({

package/src/native/network/create-fetch.ts

@@ -1,9 +1,19 @@
-import { isString, logger, Deferred, isObject, hostEmitter, isUndefined, uuidv4 } from '@jolibox/common';
+import {
+  isString,
+  logger,
+  Deferred,
+  isObject,
+  hostEmitter,
+  isUndefined,
+  uuidv4,
+  getApiHost
+} from '@jolibox/common';
 import { FetchResponse, FetchOptions } from './types';
 import { invokeNative, onNative } from '@jolibox/native-bridge';
 import { AnyFunction } from '@jolibox/types';
 import { reportError } from '@/common/report/errors/report';
 import { createAPIError } from '@/common/report/errors';
+import { context } from '@/common/context';
 
 type Fetch = <T>(
   url: string,
@@ -69,7 +79,7 @@ export function createFetch(
   }
 ) {
   const promiseMap = new Map<string, { resolve: AnyFunction; reject: AnyFunction }>();
-  const baseUrl = options?.baseUrl ?? `https://api.jolibox.com`;
+  const baseUrl = options?.baseUrl ?? getApiHost(context.testMode);
   const type = options?.type ?? 'public';
   const defaultHeaders = options?.defaultHeaders ?? {};
 

package/src/native/network/index.ts

@@ -1,6 +1,7 @@
 import { xUserAgent } from '@/common/http/xua';
 import { createFetch } from './create-fetch';
 import { context } from '@/common/context';
+import { getApiHost } from '@jolibox/common';
 
 /**
  * inner fetch
@@ -15,6 +16,6 @@ if (context.joliSource) {
 
 export const innerFetch = createFetch('createRequestTaskSync', 'operateRequestTaskSync', {
   type: 'inner',
-  baseUrl: context.testMode ? 'https://stg-api.jolibox.com' : 'https://api.jolibox.com',
+  baseUrl: getApiHost(context.testMode),
   defaultHeaders
 });

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

@@ -4,7 +4,7 @@
 
 import { context } from '@/common/context';
 import { TaskTracker, TaskPoint } from '@/common/report/task-track';
-import { EventEmitter } from '@jolibox/common';
+import { EventEmitter, getApiHost } from '@jolibox/common';
 import { innerFetch as fetch } from '../network';
 import { applyNative } from '@jolibox/native-bridge';
 import type { Track } from '.';
@@ -36,9 +36,7 @@ export class NativeTaskTracker extends TaskTracker {
     this.gameId = context.mpId;
     this.sessionId = context.sessionId;
     this.track = track;
-    this.taskUrl = context.testMode
-      ? 'https://stg-api.jolibox.com/api/base/app-event'
-      : 'https://api.jolibox.com/api/base/app-event';
+    this.taskUrl = getApiHost(context.testMode) + '/api/base/app-event';
   }
   async reporter(point: TaskPoint): Promise<void> {
     const { event, params, extraParams } = point;