@jolibox/sdk 1.1.15 → 1.1.16-beta.2

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "@jolibox/sdk",
   "description": "This project is common Jolibox JS-SDk interfere",
-  "version": "1.1.15",
+  "version": "1.1.16-beta.2",
   "main": "dist/index.cjs.js",
   "module": "dist/index.esm.js",
   "typings": "dist/index.d.ts",
   "license": "MIT",
   "dependencies": {
-    "@jolibox/common": "1.1.15",
-    "@jolibox/types": "1.1.15"
+    "@jolibox/common": "1.1.16-beta.2",
+    "@jolibox/types": "1.1.16-beta.2"
   },
   "devDependencies": {
     "typescript": "5.7.3",

package/sdk.build.log

@@ -1,17 +1,17 @@
 Invoking: npm run clean && npm run build:cjs && npm run build:esm && npm run build:iife && tsc 
 
-> @jolibox/sdk@1.1.15 clean
+> @jolibox/sdk@1.1.16-beta.2 clean
 > rimraf ./dist
 
 
-> @jolibox/sdk@1.1.15 build:cjs
+> @jolibox/sdk@1.1.16-beta.2 build:cjs
 > BUILD_VERSION=$(node -p "require('./package.json').version")  node esbuild.config.js --format=cjs
 
 
-> @jolibox/sdk@1.1.15 build:esm
+> @jolibox/sdk@1.1.16-beta.2 build:esm
 > BUILD_VERSION=$(node -p "require('./package.json').version")  node esbuild.config.js --format=esm
 
 
-> @jolibox/sdk@1.1.15 build:iife
+> @jolibox/sdk@1.1.16-beta.2 build:iife
 > BUILD_VERSION=$(node -p "require('./package.json').version")  node esbuild.config.js --format=iife
 

package/src/__tests__/index.test.ts

@@ -0,0 +1,63 @@
+import { JoliboxSDK } from '../index';
+
+describe('JoliboxSDK Singleton Pattern', () => {
+  beforeEach(() => {
+    //eslint-disable-next-line @typescript-eslint/ban-ts-comment
+    //@ts-ignore
+    JoliboxSDK.instance = null;
+
+    if (window.joliboxsdk) {
+      //eslint-disable-next-line @typescript-eslint/ban-ts-comment
+      // @ts-ignore
+      delete window.joliboxsdk;
+    }
+  });
+
+  it('should return the same instance when using new constructor', () => {
+    // 创建第一个实例
+    const instance1 = new JoliboxSDK();
+
+    // 创建第二个实例
+    const instance2 = new JoliboxSDK();
+
+    // 验证两个实例是同一个对象
+    expect(instance1).toBe(instance2);
+  });
+
+  it('should return the same instance when using getInstance method', () => {
+    // 使用静态方法创建实例
+    const instance1 = JoliboxSDK.getInstance();
+
+    // 再次使用静态方法获取实例
+    const instance2 = JoliboxSDK.getInstance();
+
+    // 验证两个实例是同一个对象
+    expect(instance1).toBe(instance2);
+  });
+
+  it('should return the same instance when mixing constructor and getInstance', () => {
+    // 使用构造函数创建实例
+    const instance1 = new JoliboxSDK();
+
+    // 使用静态方法获取实例
+    const instance2 = JoliboxSDK.getInstance();
+
+    // 验证两个实例是同一个对象
+    expect(instance1).toBe(instance2);
+  });
+
+  it('should initialize window.joliboxsdk with SDK instances', () => {
+    // 创建实例
+    new JoliboxSDK();
+
+    // 验证全局对象上的引用
+    expect(window.joliboxsdk).toBeDefined();
+    expect(window.joliboxsdk.runtime).toBeDefined();
+    expect(window.joliboxsdk.ads).toBeDefined();
+    expect(window.joliboxsdk.lifecycle).toBeDefined();
+    expect(window.joliboxsdk.storage).toBeDefined();
+    expect(window.joliboxsdk.keyboard).toBeDefined();
+    expect(window.joliboxsdk.task).toBeDefined();
+    expect(window.joliboxsdk.router).toBeDefined();
+  });
+});

package/src/api/index.ts

@@ -2,3 +2,4 @@ export * from './get-system-info';
 export * from './can-i-use';
 export * from './login';
 export * from './request';
+export * from './on-custom-event';

package/src/api/on-custom-event.ts

@@ -0,0 +1,9 @@
+import { hostEmitter } from '@jolibox/common';
+import { HostEventParamsMap } from '@jolibox/types';
+
+// Define the custom events we want to support
+type CustomEventType = 'onI18nChanged';
+
+export const onCustomEvent = <T extends CustomEventType>(event: T, callback: HostEventParamsMap[T]) => {
+  hostEmitter.on(event, callback);
+};

package/src/events.ts

@@ -1,4 +1,4 @@
-import { hostEmitter, createCommands, BaseError, EProject } from '@jolibox/common';
+import { hostEmitter, createCommands, BaseError } from '@jolibox/common';
 import { trackError } from './utils/event-tracker';
 document.addEventListener('DOMContentLoaded', () => hostEmitter.emit('onDocumentReady', timeline.startTime));
 
@@ -19,24 +19,46 @@ export const timeline = timelineFactory();
 const commands = createCommands();
 
 const rejectHandler = (event: PromiseRejectionEvent | ErrorEvent | BaseError) => {
+  let errorInfo;
+
+  if (event instanceof ErrorEvent) {
+    errorInfo = {
+      message: event.message,
+      source: event.filename,
+      lineno: event.lineno,
+      colno: event.colno,
+      error: event.error ? event.error.stack || event.error.toString() : null
+    };
+  } else if ('reason' in event) {
+    // PromiseRejectionEvent
+    const reason = event.reason;
+    errorInfo = {
+      message: reason instanceof Error ? reason.message : String(reason),
+      stack: reason instanceof Error ? reason.stack : null,
+      type: 'unhandledrejection'
+    };
+  } else if (event instanceof BaseError) {
+    errorInfo = {
+      message: event.message,
+      name: event.name,
+      stack: event.stack
+    };
+  } else {
+    errorInfo = { unknownError: true };
+  }
+
   commands
     .executeCommand('ReportSDK.traceSystem', {
       event: 'globalJsError',
       info: {
-        err: JSON.stringify(event)
+        err: JSON.stringify(errorInfo)
       }
     })
     .catch((e) => {
       // 兜底上报
-      console.error(`Fallback report: ${e} ${JSON.stringify(event)}`);
+      console.error(`Fallback report: ${e} ${JSON.stringify(errorInfo)}`);
       trackError({
-        err: JSON.stringify({
-          message: e.message,
-          source: e.source,
-          lineno: e.lineno,
-          colno: e.colno,
-          error: e.error
-        })
+        err: JSON.stringify(errorInfo)
       });
     });
 };
@@ -46,29 +68,26 @@ export const reportError = rejectHandler;
 window.addEventListener('unhandledrejection', rejectHandler.bind(this));
 window.addEventListener('error', rejectHandler.bind(this));
 window.onerror = (message, source, lineno, colno, error) => {
+  const errorInfo = {
+    message,
+    source,
+    lineno,
+    colno,
+    stack: error?.stack,
+    errorString: error?.toString()
+  };
+
   commands
     .executeCommand('ReportSDK.traceSystem', {
       event: 'globalJsError',
       info: {
-        err: JSON.stringify({
-          message,
-          source,
-          lineno,
-          colno,
-          error
-        })
+        err: JSON.stringify(errorInfo)
       }
     })
     .catch((e) => {
       // 兜底上报
       trackError({
-        err: JSON.stringify({
-          message,
-          source,
-          lineno,
-          colno,
-          error
-        })
+        err: JSON.stringify(errorInfo)
       });
     });
 };

package/src/index.ts

@@ -8,7 +8,7 @@ import './loader';
 /**
  * @public Jolibox JS SDK Entry
  */
-import { getSystemInfoSync, canIUse, login, checkSession, request } from './api';
+import { getSystemInfoSync, canIUse, login, checkSession, request, onCustomEvent } from './api';
 import { RuntimeSDK } from './sdks/runtime';
 import { LifecycleSDK } from './sdks/lifecycle';
 import { StorageSDK } from './sdks/storage';
@@ -33,6 +33,8 @@ declare global {
 }
 
 export class JoliboxSDK {
+  private static instance: JoliboxSDK | null = null;
+
   readonly jssdkVersion = '__JOLIBOX_LOCAL_SDK_VERSION__';
   readonly runtime = new RuntimeSDK();
   readonly ads = new JoliboxAds();
@@ -48,8 +50,13 @@ export class JoliboxSDK {
   login = login.bind(this);
   checkSession = checkSession.bind(this);
   request = request.bind(this);
+  on = onCustomEvent.bind(this);
 
   constructor() {
+    if (JoliboxSDK.instance) {
+      return JoliboxSDK.instance;
+    }
+
     window.joliboxsdk = {
       runtime: this.runtime,
       ads: this.ads,
@@ -59,6 +66,17 @@ export class JoliboxSDK {
       task: this.task,
       router: this.router
     };
+
+    JoliboxSDK.instance = this;
+    console.log(`JoliboxSDK ${this.jssdkVersion} init`);
+  }
+
+  // 添加静态方法获取实例
+  public static getInstance(): JoliboxSDK {
+    if (!JoliboxSDK.instance) {
+      JoliboxSDK.instance = new JoliboxSDK();
+    }
+    return JoliboxSDK.instance;
   }
 }
 

package/src/loader/h5.ts

@@ -17,10 +17,7 @@ declare global {
 const LOCAL_STORE_KEY = 'jolibox-sdk-loadermeta';
 interface LocalStoreMeta {
   bootstrap_version?: string;
-  bootstrap_script?: string;
-
   implement_version?: string;
-  implement_script?: string;
   timestamp?: number;
 }
 
@@ -32,11 +29,10 @@ const now = Date.now();
 const expired = (now: number, prev: number) =>
   now > prev && Math.abs(now - prev) / (1000 * 60 * 60 * 24) >= 7;
 
-const isLegalScript = (str: string) =>
-  !/^(Failed to fetch version|Couldn't find the requested file)/.test(str);
 async function fetchCurrentRemoteScript() {
   const host = testMode ? 'https://stg-api.jolibox.com' : 'https://api.jolibox.com';
   const path = `${host}/api/fe-configs/js-sdk/version-metadata`;
+
   try {
     const response = await fetch(path, {
       method: 'GET',
@@ -51,13 +47,10 @@ async function fetchCurrentRemoteScript() {
       if (currentLocalBootstrapVersion && compare(currentLocalBootstrapVersion, bootstrap_version) >= 0) {
         // no-op
       } else {
-        const currentBootstrapModuleStr = await (await fetch(getBoostrapModuleUrl(bootstrap_version))).text();
-        isLegalScript(currentBootstrapModuleStr) &&
-          (currentStore = {
-            ...currentStore,
-            bootstrap_version,
-            bootstrap_script: currentBootstrapModuleStr
-          });
+        currentStore = {
+          ...currentStore,
+          bootstrap_version
+        };
       }
     }
     if (implement_version) {
@@ -65,15 +58,10 @@ async function fetchCurrentRemoteScript() {
       if (currentLocalImpelementVersion && compare(currentLocalImpelementVersion, implement_version) >= 0) {
         // no-op
       } else {
-        const currentImplementModuleStr = await (
-          await fetch(getImplementModuleUrl(implement_version))
-        ).text();
-        isLegalScript(currentImplementModuleStr) &&
-          (currentStore = {
-            ...currentStore,
-            implement_version,
-            implement_script: currentImplementModuleStr
-          });
+        currentStore = {
+          ...currentStore,
+          implement_version
+        };
       }
     }
 
@@ -89,12 +77,15 @@ export const createLoadImplement = (params: {
   bootstrapUrl: string;
   implementUrl: string;
 }) => {
-  const { currentMajorVersion, currentVersion, bootstrapUrl, implementUrl } = params;
+  const { currentMajorVersion, currentVersion } = params;
+
+  let bootstrapUrl = params.bootstrapUrl;
+  let implementUrl = params.implementUrl;
   function fetchCurrentBootstrapModule():
     | { script: string; type: 'localscript' | 'fetch_from_cdn' }
     | undefined {
-    const { bootstrap_version, bootstrap_script, timestamp } = CURRENT_VERSION_STORE;
-    if (bootstrap_version && bootstrap_script && timestamp) {
+    const { bootstrap_version, timestamp } = CURRENT_VERSION_STORE;
+    if (bootstrap_version && timestamp) {
       /**
        * if current SDK major version is same && remote version is larget than current, use latest version
        */
@@ -103,7 +94,7 @@ export const createLoadImplement = (params: {
         major(bootstrap_version) == currentMajorVersion &&
         compare(bootstrap_version, currentVersion) >= 0
       ) {
-        return { script: bootstrap_script, type: 'localscript' };
+        bootstrapUrl = getBoostrapModuleUrl(bootstrap_version);
       }
     }
     try {
@@ -136,31 +127,11 @@ export const createLoadImplement = (params: {
     }
   }
 
-  function evalLocalJSModule(code: string) {
-    const evalJS = async (code: string) => {
-      try {
-        const blob = new Blob([code], { type: 'application/javascript' });
-        const blobUrl = URL.createObjectURL(blob);
-        const module = await import(blobUrl);
-        URL.revokeObjectURL(blobUrl);
-        return module;
-      } catch (error) {
-        const internalError = new InternalJSModuleEvalError(
-          `implement module evaluate error in h5:${error} `
-        );
-        trackError({
-          err: `${internalError}`
-        });
-      }
-    };
-    evalJS(code);
-  }
-
   // load remote impletation
   function loadRemoteImplement() {
     const implStartLoad = Date.now();
-    const { implement_script, implement_version, timestamp } = CURRENT_VERSION_STORE;
-    if (implement_script && implement_version && timestamp) {
+    const { implement_version, timestamp } = CURRENT_VERSION_STORE;
+    if (implement_version && timestamp) {
       /**
        * if current SDK major version is same && remote version is larget than current, use latest version
        */
@@ -169,9 +140,7 @@ export const createLoadImplement = (params: {
         major(implement_version) == currentMajorVersion &&
         compare(implement_version, currentVersion) >= 0
       ) {
-        evalLocalJSModule(implement_script);
-        trackPerformance('implementModuleLoaded', Date.now() - implStartLoad, { type: 'loadscript' });
-        return;
+        implementUrl = getImplementModuleUrl(implement_version);
       }
     }
     const asyncScript = document.createElement('script');