smart-load-manager 1.1.0 → 1.2.0

package/dist/index.cjs

@@ -63,7 +63,12 @@ class SmartService {
     this._mutex = Promise.resolve();
   }
   static config(options) {
-    if (options) this._config = __spreadValues$1(__spreadValues$1({}, this._config), options);
+    if (options) {
+      this._config = __spreadValues$1(__spreadValues$1({}, this._config), options);
+      if (Object.prototype.hasOwnProperty.call(this, "_instance") && this._instance) {
+        this._instance._config = this._config;
+      }
+    }
     return this._config;
   }
   /** Create a new instance of SmartService */
@@ -72,7 +77,7 @@ class SmartService {
   }
   /** Get the singleton instance of SmartService */
   static get instance() {
-    if (!this._instance) {
+    if (!Object.prototype.hasOwnProperty.call(this, "_instance") || !this._instance) {
       this._instance = new this(this._config);
     }
     return this._instance;
@@ -225,7 +230,7 @@ class SmartLoad {
       (() => __async$1(this, null, function* () {
         try {
           yield this._whenStarted.promise;
-          yield previousTask();
+          yield typeof previousTask === "function" ? previousTask() : previousTask;
         } catch (e) {
         } finally {
           resolve();
@@ -300,6 +305,11 @@ var __async = (__this, __arguments, generator) => {
 const IDLE_THRESHOLD_DURATION = 46.6;
 const IDLE_THRESHOLD_RATIO = 0.9;
 const IDLE_TIMEOUT = 1e4;
+const reqIdle = (cb, opts) => typeof requestIdleCallback === "function" ? requestIdleCallback(cb, opts) : setTimeout(() => cb({ didTimeout: false, timeRemaining: () => 50 }), 1);
+const cancelIdle = (id) => {
+  if (id === void 0) return;
+  typeof cancelIdleCallback === "function" ? cancelIdleCallback(id) : clearTimeout(id);
+};
 function promisifyIdle(options = {}) {
   var _a, _b;
   const idleThresholdRatio = ((_a = options.thresholds) == null ? void 0 : _a.ratio) || IDLE_THRESHOLD_RATIO;
@@ -310,9 +320,15 @@ function promisifyIdle(options = {}) {
   return new Promise((resolve, reject) => {
     const start = performance.now();
     let previousFrameEnd = start;
+    let idleId;
+    let settled = false;
     const log = [];
     const last3 = [0, 0, 0];
     function finish(withResolve, reason) {
+      if (settled) return;
+      settled = true;
+      !withResolve && cancelIdle(idleId);
+      signal == null ? void 0 : signal.removeEventListener("abort", onAbort);
       if (debug) {
         console.table(log);
         console.log(`Idle has ${withResolve ? "reached" : "aborted"} after ${performance.now() - start}ms`);
@@ -321,8 +337,11 @@ function promisifyIdle(options = {}) {
       }
       return withResolve ? resolve(true) : reject(reason);
     }
+    const onAbort = () => finish(false, new Error("Rejected by abort signal"));
+    if (signal == null ? void 0 : signal.aborted) return onAbort();
+    signal == null ? void 0 : signal.addEventListener("abort", onAbort, { once: true });
     const cb = (deadline) => {
-      if (signal == null ? void 0 : signal.aborted) return finish(false, new Error("Rejected by abort signal"));
+      if (signal == null ? void 0 : signal.aborted) return onAbort();
       const allocated = deadline.timeRemaining();
       const frameEnd = performance.now() + allocated;
       const frameLength = frameEnd - previousFrameEnd;
@@ -337,15 +356,15 @@ function promisifyIdle(options = {}) {
       debug && !isBadFrame && log.push([timeout, frameLength, allocated, idleRatio, idleRatio > idleThresholdRatio ? 1 : 0, last3.toString()]);
       if (isIdleNow || deadline.didTimeout) return finish(true);
       !isBadFrame && (previousFrameEnd = frameEnd);
-      requestIdleCallback(cb, { timeout });
+      idleId = reqIdle(cb, { timeout });
     };
-    requestIdleCallback(cb, { timeout: idleTimeout });
+    idleId = reqIdle(cb, { timeout: idleTimeout });
   });
 }
 function asyncSeries(tasks) {
   return __async(this, null, function* () {
     for (const task of tasks) {
-      yield task().catch();
+      yield task().catch(() => void 0);
     }
   });
 }
@@ -380,7 +399,7 @@ function waitUserActivity() {
 }
 function waitIdle(options = {}) {
   return (abortSignal) => __async(null, null, function* () {
-    return promisifyIdle(__spreadProps(__spreadValues({}, options), { signal: abortSignal }));
+    return promisifyIdle(__spreadProps(__spreadValues({}, options), { signal: abortSignal != null ? abortSignal : options.signal }));
   });
 }
 

package/dist/index.d.cts

@@ -65,6 +65,7 @@ declare class SmartService {
     protected _debug(...args: unknown[]): void;
 }
 
+type PreviousTask = (() => Promise<unknown>) | Promise<unknown>;
 /** Manager for smart loading of services */
 declare class SmartLoad {
     protected static _whenStarted: _exadel_esl_modules_esl_utils_async.Deferred<void>;
@@ -76,9 +77,9 @@ declare class SmartLoad {
     static onLoaded(): Promise<void>;
     /** Wait until the document is fully loaded and then resolve */
     static onComplete(): Promise<void>;
-    protected static createMutex(previousTask: () => Promise<unknown>): Promise<void>;
+    protected static createMutex(previousTask: PreviousTask): Promise<void>;
     /** Queue a service to be loaded after the given task */
-    static queue(service: typeof SmartService | SmartService, after?: () => Promise<unknown>): void;
+    static queue(service: typeof SmartService | SmartService, after?: PreviousTask): void;
     /** Start the smart loading process */
     static start(): void;
 }

package/dist/index.d.mts

@@ -65,6 +65,7 @@ declare class SmartService {
     protected _debug(...args: unknown[]): void;
 }
 
+type PreviousTask = (() => Promise<unknown>) | Promise<unknown>;
 /** Manager for smart loading of services */
 declare class SmartLoad {
     protected static _whenStarted: _exadel_esl_modules_esl_utils_async.Deferred<void>;
@@ -76,9 +77,9 @@ declare class SmartLoad {
     static onLoaded(): Promise<void>;
     /** Wait until the document is fully loaded and then resolve */
     static onComplete(): Promise<void>;
-    protected static createMutex(previousTask: () => Promise<unknown>): Promise<void>;
+    protected static createMutex(previousTask: PreviousTask): Promise<void>;
     /** Queue a service to be loaded after the given task */
-    static queue(service: typeof SmartService | SmartService, after?: () => Promise<unknown>): void;
+    static queue(service: typeof SmartService | SmartService, after?: PreviousTask): void;
     /** Start the smart loading process */
     static start(): void;
 }

package/dist/index.mjs

@@ -61,7 +61,12 @@ class SmartService {
     this._mutex = Promise.resolve();
   }
   static config(options) {
-    if (options) this._config = __spreadValues$1(__spreadValues$1({}, this._config), options);
+    if (options) {
+      this._config = __spreadValues$1(__spreadValues$1({}, this._config), options);
+      if (Object.prototype.hasOwnProperty.call(this, "_instance") && this._instance) {
+        this._instance._config = this._config;
+      }
+    }
     return this._config;
   }
   /** Create a new instance of SmartService */
@@ -70,7 +75,7 @@ class SmartService {
   }
   /** Get the singleton instance of SmartService */
   static get instance() {
-    if (!this._instance) {
+    if (!Object.prototype.hasOwnProperty.call(this, "_instance") || !this._instance) {
       this._instance = new this(this._config);
     }
     return this._instance;
@@ -223,7 +228,7 @@ class SmartLoad {
       (() => __async$1(this, null, function* () {
         try {
           yield this._whenStarted.promise;
-          yield previousTask();
+          yield typeof previousTask === "function" ? previousTask() : previousTask;
         } catch (e) {
         } finally {
           resolve();
@@ -298,6 +303,11 @@ var __async = (__this, __arguments, generator) => {
 const IDLE_THRESHOLD_DURATION = 46.6;
 const IDLE_THRESHOLD_RATIO = 0.9;
 const IDLE_TIMEOUT = 1e4;
+const reqIdle = (cb, opts) => typeof requestIdleCallback === "function" ? requestIdleCallback(cb, opts) : setTimeout(() => cb({ didTimeout: false, timeRemaining: () => 50 }), 1);
+const cancelIdle = (id) => {
+  if (id === void 0) return;
+  typeof cancelIdleCallback === "function" ? cancelIdleCallback(id) : clearTimeout(id);
+};
 function promisifyIdle(options = {}) {
   var _a, _b;
   const idleThresholdRatio = ((_a = options.thresholds) == null ? void 0 : _a.ratio) || IDLE_THRESHOLD_RATIO;
@@ -308,9 +318,15 @@ function promisifyIdle(options = {}) {
   return new Promise((resolve, reject) => {
     const start = performance.now();
     let previousFrameEnd = start;
+    let idleId;
+    let settled = false;
     const log = [];
     const last3 = [0, 0, 0];
     function finish(withResolve, reason) {
+      if (settled) return;
+      settled = true;
+      !withResolve && cancelIdle(idleId);
+      signal == null ? void 0 : signal.removeEventListener("abort", onAbort);
       if (debug) {
         console.table(log);
         console.log(`Idle has ${withResolve ? "reached" : "aborted"} after ${performance.now() - start}ms`);
@@ -319,8 +335,11 @@ function promisifyIdle(options = {}) {
       }
       return withResolve ? resolve(true) : reject(reason);
     }
+    const onAbort = () => finish(false, new Error("Rejected by abort signal"));
+    if (signal == null ? void 0 : signal.aborted) return onAbort();
+    signal == null ? void 0 : signal.addEventListener("abort", onAbort, { once: true });
     const cb = (deadline) => {
-      if (signal == null ? void 0 : signal.aborted) return finish(false, new Error("Rejected by abort signal"));
+      if (signal == null ? void 0 : signal.aborted) return onAbort();
       const allocated = deadline.timeRemaining();
       const frameEnd = performance.now() + allocated;
       const frameLength = frameEnd - previousFrameEnd;
@@ -335,15 +354,15 @@ function promisifyIdle(options = {}) {
       debug && !isBadFrame && log.push([timeout, frameLength, allocated, idleRatio, idleRatio > idleThresholdRatio ? 1 : 0, last3.toString()]);
       if (isIdleNow || deadline.didTimeout) return finish(true);
       !isBadFrame && (previousFrameEnd = frameEnd);
-      requestIdleCallback(cb, { timeout });
+      idleId = reqIdle(cb, { timeout });
     };
-    requestIdleCallback(cb, { timeout: idleTimeout });
+    idleId = reqIdle(cb, { timeout: idleTimeout });
   });
 }
 function asyncSeries(tasks) {
   return __async(this, null, function* () {
     for (const task of tasks) {
-      yield task().catch();
+      yield task().catch(() => void 0);
     }
   });
 }
@@ -378,7 +397,7 @@ function waitUserActivity() {
 }
 function waitIdle(options = {}) {
   return (abortSignal) => __async(null, null, function* () {
-    return promisifyIdle(__spreadProps(__spreadValues({}, options), { signal: abortSignal }));
+    return promisifyIdle(__spreadProps(__spreadValues({}, options), { signal: abortSignal != null ? abortSignal : options.signal }));
   });
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "smart-load-manager",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "description": "A service and add-on utilities for managing third-party service (e.g., AdSense) loading for your web application that help improve Core Web Vitals.",
   "main": "./dist/index.cjs",
   "module": "./dist/index.mjs",