@antglobal/create-sdk-loader 1.0.0 → 1.0.2

package/lib/main.d.ts

@@ -1,10 +1,20 @@
-type Code = 'NO_REMOTE_CLASS' | 'LOAD_ERROR' | 'INIT_ERROR';
+type Code = 'NO_REMOTE_CLASS' | 'LOAD_ERROR' | 'INIT_ERROR' | 'LOAD_TIMEOUT';
 declare class LoaderError extends Error {
     code: Code;
     constructor(code: Code, message: string);
 }
+interface InitType<ClassType> {
+    init: () => Promise<ClassType>;
+}
 interface LoaderConfig<Config, ClassType> {
+    /**
+     * @description sdk cdn url
+     */
     sdkURL: string;
+    /**
+     * @description the unit is ms, default 20000
+     */
+    timeout?: number;
     globalName: string | (() => new (config: Config) => ClassType);
     /**
      * @description when load error occurs, you can use this callback to monitoring report
@@ -19,12 +29,13 @@ interface LoaderConfig<Config, ClassType> {
      * @description you can use this callback to monitoring report
      * @param fromCache whether the SDK is loaded from cache
      */
-    onLoadComplete?: (fromCache: boolean) => void;
+    onLoadComplete?: () => void;
     /**
      * @description when the SDK is initialized successfully, you can use this callback to monitoring report
      */
     onInitialized?: (instance: ClassType, url: string) => void;
 }
-export declare function createLoader<Config, ClassType>(loadConfig: LoaderConfig<Config, ClassType>): (config: Config) => Promise<ClassType>;
-export declare function loadScript<T = any>(url: string): Promise<T>;
+export declare function createInstance<Config, ClassType extends InitType<ClassType>>(ClassConstructor: new (config: Config) => ClassType, config: Config): Promise<ClassType>;
+export declare function createLoader<Config, ClassType extends InitType<ClassType>>(loadConfig: LoaderConfig<Config, ClassType>): (config: Config) => Promise<ClassType>;
+export declare function loadScript<ClassType extends InitType<ClassType>, Params = any, SDKConstructor = new (config: Params) => ClassType>(url: string, globalName: string | (() => SDKConstructor)): Promise<SDKConstructor>;
 export {};

package/lib/main.js

@@ -1,64 +1,160 @@
-class LoaderError extends Error {
-    code;
-    constructor(code, message) {
-        super(message);
-        this.name = 'LoaderError';
-        this.code = code;
-    }
-}
-export function createLoader(loadConfig) {
-    const { sdkURL, globalName, onLoadComplete, onError, onLoadStart, onInitialized } = loadConfig;
-    const getRemoteClass = () => {
-        if (typeof globalName === 'function') {
-            return globalName();
-        }
-        else {
-            return window[globalName];
-        }
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
+        return extendStatics(d, b);
     };
-    return (config) => {
-        onLoadStart?.();
-        let RemoteClass = getRemoteClass();
-        if (RemoteClass) {
-            onLoadComplete?.(true);
-            return Promise.resolve(new RemoteClass(config));
-        }
-        return loadScript(sdkURL)
-            .then(() => {
-            onLoadComplete?.(false);
-            const RemoteClass = getRemoteClass();
-            if (!RemoteClass) {
-                throw new LoaderError('NO_REMOTE_CLASS', `No variables ${globalName} were found. Cannot be initialized the Class ${globalName}`);
-            }
-            try {
-                const instance = new RemoteClass(config);
-                onInitialized?.(instance, window.location.href);
-                return instance;
-            }
-            catch (e) {
-                throw new LoaderError('INIT_ERROR', `Initialize Class ${globalName} failed: ${e.message}`);
+    return function (d, b) {
+        if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
+    return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
             }
-        })
-            .catch((e) => {
-            onError?.(e);
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createInstance = createInstance;
+exports.createLoader = createLoader;
+exports.loadScript = loadScript;
+var LoaderError = /** @class */ (function (_super) {
+    __extends(LoaderError, _super);
+    function LoaderError(code, message) {
+        var _this = _super.call(this, message) || this;
+        Object.defineProperty(_this, "code", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        _this.name = 'LoaderError';
+        _this.code = code;
+        return _this;
+    }
+    return LoaderError;
+}(Error));
+function createInstance(ClassConstructor, config) {
+    var instance = new ClassConstructor(config);
+    return instance.init();
+}
+function createLoader(loadConfig) {
+    var _this = this;
+    var sdkURL = loadConfig.sdkURL, globalName = loadConfig.globalName, _a = loadConfig.timeout, timeout = _a === void 0 ? 20000 : _a, onLoadComplete = loadConfig.onLoadComplete, onError = loadConfig.onError, onLoadStart = loadConfig.onLoadStart, onInitialized = loadConfig.onInitialized;
+    return function (config) {
+        onLoadStart === null || onLoadStart === void 0 ? void 0 : onLoadStart();
+        var _loadScript = createTimeout(function () { return loadScript(sdkURL, globalName); }, timeout);
+        return _loadScript()
+            .then(function (RemoteClass) { return __awaiter(_this, void 0, void 0, function () {
+            var instance, e_1;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        onLoadComplete === null || onLoadComplete === void 0 ? void 0 : onLoadComplete();
+                        if (!RemoteClass) {
+                            throw new LoaderError('NO_REMOTE_CLASS', "No variables ".concat(globalName, " were found. Cannot be initialized the Class ").concat(globalName));
+                        }
+                        _a.label = 1;
+                    case 1:
+                        _a.trys.push([1, 3, , 4]);
+                        return [4 /*yield*/, createInstance(RemoteClass, config)];
+                    case 2:
+                        instance = _a.sent();
+                        onInitialized === null || onInitialized === void 0 ? void 0 : onInitialized(instance, window.location.href);
+                        return [2 /*return*/, instance];
+                    case 3:
+                        e_1 = _a.sent();
+                        throw new LoaderError('INIT_ERROR', "Initialize Class ".concat(globalName, " failed: ").concat(e_1.message));
+                    case 4: return [2 /*return*/];
+                }
+            });
+        }); })
+            .catch(function (e) {
+            onError === null || onError === void 0 ? void 0 : onError(e);
             return Promise.reject(e);
         });
     };
 }
-export function loadScript(url) {
-    return new Promise((resolve, reject) => {
-        const existedScript = document.querySelector(`script[src="${url}"]`);
-        const script = existedScript || document.createElement('script');
+function loadScript(url, globalName) {
+    return new Promise(function (resolve, reject) {
+        var getRemoteClass = function () {
+            if (typeof globalName === 'function') {
+                return globalName();
+            }
+            else {
+                var className = window[globalName];
+                return (className === null || className === void 0 ? void 0 : className.default) || className;
+            }
+        };
+        var RemoteClass = getRemoteClass();
+        if (RemoteClass) {
+            return resolve(RemoteClass);
+        }
+        var existedScript = document.querySelector("script[src=\"".concat(url, "\"]"));
+        var script = existedScript || document.createElement('script');
         script.src = url;
         script.async = true;
-        script.addEventListener('load', () => {
-            resolve(true);
+        script.addEventListener('load', function () {
+            // There is must use getRemoteClass
+            resolve(getRemoteClass());
         });
-        script.addEventListener('error', (e) => {
-            reject(new LoaderError('LOAD_ERROR', `Load script ${url} failed: ${e.message}`));
+        script.addEventListener('error', function (e) {
+            reject(new LoaderError('LOAD_ERROR', "Load script ".concat(url, " failed: ").concat(e.message)));
         });
         if (!existedScript) {
             document.head.appendChild(script);
         }
     });
 }
+function createTimeout(fn, t) {
+    return function () {
+        var _args = [];
+        for (var _i = 0; _i < arguments.length; _i++) {
+            _args[_i] = arguments[_i];
+        }
+        return Promise.race([
+            new Promise(function (_r, reject) {
+                setTimeout(function () {
+                    reject(new LoaderError('LOAD_TIMEOUT', "Load timeout: ".concat(t)));
+                }, t);
+            }),
+            fn.apply(void 0, _args)
+        ]);
+    };
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antglobal/create-sdk-loader",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "main": "./lib/main.js",
   "module": "./lib/main.js",
   "types": "./lib/main.d.ts",
@@ -10,9 +10,7 @@
   ],
   "scripts": {
     "dev": "vite",
-    "build": "tsc",
-    "preview": "vite preview",
-    "postpublish": "node scripts/restorePkg.mjs"
+    "build": "tsc"
   },
   "devDependencies": {
     "typescript": "~5.9.3",