@js-toolkit/web-utils 1.49.0 → 1.50.0

package/EventListeners.d.ts

@@ -2,6 +2,7 @@ import { EventEmitterListener } from './EventEmitterListener';
 import type { EmitterTarget, GetEventMap } from './EventEmitterListener.utils';
 export declare class EventListeners {
     private readonly listeners;
+    getScopes(): IterableIterator<EmitterTarget>;
     scope<T extends EmitterTarget, M extends AnyObject = GetEventMap<T>>(target: T, scope?: string): EventEmitterListener<T, M>;
     removeAllListeners<T extends EmitterTarget>(target?: T | undefined, scope?: string): this;
 }

package/EventListeners.js

@@ -1 +1 @@
-import{EventEmitterListener}from"./EventEmitterListener";export class EventListeners{constructor(){this.listeners=new Map}scope(e,s){var t,l;const r=null!=s?s:"",i=null!==(t=this.listeners.get(e))&&void 0!==t?t:new Map;!this.listeners.has(e)&&this.listeners.set(e,i);const n=null!==(l=i.get(r))&&void 0!==l?l:new EventEmitterListener(e);return!i.has(r)&&i.set(r,n),n}removeAllListeners(e,s){var t;if(e)if(s){const l=this.listeners.get(e);null===(t=null==l?void 0:l.get(s))||void 0===t||t.removeAllListeners(),null==l||l.delete(s),0===(null==l?void 0:l.size)&&this.listeners.delete(e)}else{const s=this.listeners.get(e);null==s||s.forEach((e=>e.removeAllListeners())),null==s||s.clear(),this.listeners.delete(e)}else this.listeners.forEach((e=>{e.forEach((e=>e.removeAllListeners())),e.clear()})),this.listeners.clear();return this}}
+import{EventEmitterListener}from"./EventEmitterListener";export class EventListeners{constructor(){this.listeners=new Map}getScopes(){return this.listeners.keys()}scope(e,s){var t,l;const r=null!=s?s:"",i=null!==(t=this.listeners.get(e))&&void 0!==t?t:new Map;!this.listeners.has(e)&&this.listeners.set(e,i);const n=null!==(l=i.get(r))&&void 0!==l?l:new EventEmitterListener(e);return!i.has(r)&&i.set(r,n),n}removeAllListeners(e,s){var t;if(e)if(s){const l=this.listeners.get(e);null===(t=null==l?void 0:l.get(s))||void 0===t||t.removeAllListeners(),null==l||l.delete(s),0===(null==l?void 0:l.size)&&this.listeners.delete(e)}else{const s=this.listeners.get(e);null==s||s.forEach((e=>e.removeAllListeners())),null==s||s.clear(),this.listeners.delete(e)}else this.listeners.forEach((e=>{e.forEach((e=>e.removeAllListeners())),e.clear()})),this.listeners.clear();return this}}

package/PipController.d.ts

@@ -15,8 +15,8 @@ export declare class PipController extends EventEmitter<PipController.EventMap>
     private readonly listener;
     constructor(video: HTMLVideoElement);
     destroy(): Promise<void>;
-    get isPip(): boolean;
-    get currentElement(): HTMLVideoElement | null;
+    isPip(): boolean;
+    getCurrentElement(): HTMLVideoElement | null;
     request(): Promise<void>;
     exit(): Promise<void>;
 }
@@ -26,7 +26,7 @@ export declare namespace PipController {
     }
     type EventMap = {
         [Events.Change]: [{
-            isPip: boolean;
+            pip: boolean;
         }];
     };
 }

package/PipController.js

@@ -1 +1 @@
-import{EventEmitter}from"eventemitter3";import{EventEmitterListener}from"./EventEmitterListener";const getPipUnavailableError=()=>new Error("PiP is not available");export class PipController extends EventEmitter{static isApiEnabled(){return!!HTMLVideoElement.prototype.requestPictureInPicture&&!!document.exitPictureInPicture&&!!document.pictureInPictureEnabled}static isWebkitApiEnabled(){return!!HTMLVideoElement.prototype.webkitSupportsPresentationMode&&HTMLVideoElement.prototype.webkitSupportsPresentationMode("picture-in-picture")}static isAvailable(e){return this.isApiEnabled()&&!e.disablePictureInPicture||this.isWebkitApiEnabled()}get Events(){return PipController.Events}constructor(e){if(super(),this.listener=new EventEmitterListener(e),PipController.isAvailable(e)){const e=()=>{this.emit(this.Events.Change,{isPip:!0})},t=()=>{this.emit(this.Events.Change,{isPip:!1})};PipController.isApiEnabled()?(this.listener.on("enterpictureinpicture",e),this.listener.on("leavepictureinpicture",t)):this.listener.on("webkitpresentationmodechanged",(()=>{let i=this.listener.target.webkitPresentationMode;return()=>{"picture-in-picture"===this.listener.target.webkitPresentationMode?e():"picture-in-picture"===i&&t(),i=this.listener.target.webkitPresentationMode}})(),!0)}}destroy(){return this.exit().finally((()=>{this.removeAllListeners(),this.listener.removeAllListeners()}))}get isPip(){return PipController.isApiEnabled()?document.pictureInPictureElement===this.listener.target:"picture-in-picture"===this.listener.target.webkitPresentationMode}get currentElement(){return this.isPip?this.listener.target:null}request(){return new Promise(((e,t)=>{if(this.isPip)e();else{if(!PipController.isAvailable(this.listener.target))throw getPipUnavailableError();PipController.isApiEnabled()?this.listener.target.requestPictureInPicture().then((()=>e()),t):(this.listener.once("webkitpresentationmodechanged",(()=>{"picture-in-picture"===this.listener.target.webkitPresentationMode?e():t(new Error("Something went wrong."))}),!0),this.listener.target.webkitSetPresentationMode("picture-in-picture"))}}))}exit(){return new Promise(((e,t)=>{if(this.isPip){if(!PipController.isAvailable(this.listener.target))throw getPipUnavailableError();PipController.isApiEnabled()?document.exitPictureInPicture().then(e,t):(this.listener.once("webkitpresentationmodechanged",(()=>{"picture-in-picture"!==this.listener.target.webkitPresentationMode?e():t(new Error("Something went wrong."))}),!0),this.listener.target.webkitSetPresentationMode("inline"))}else e()}))}}!function(e){let t;!function(e){e.Change="change"}(t=e.Events||(e.Events={}))}(PipController||(PipController={}));
+import{EventEmitter}from"eventemitter3";import{EventEmitterListener}from"./EventEmitterListener";const getPipUnavailableError=()=>new Error("PiP is not available");export class PipController extends EventEmitter{static isApiEnabled(){return!!HTMLVideoElement.prototype.requestPictureInPicture&&!!document.exitPictureInPicture&&!!document.pictureInPictureEnabled}static isWebkitApiEnabled(e){return!!e.webkitSupportsPresentationMode&&e.webkitSupportsPresentationMode("picture-in-picture")}static isAvailable(e){return this.isApiEnabled()&&!e.disablePictureInPicture||this.isWebkitApiEnabled(e)}get Events(){return PipController.Events}constructor(e){if(super(),this.listener=new EventEmitterListener(e),PipController.isAvailable(e)){const e=()=>{this.emit(this.Events.Change,{pip:!0})},t=()=>{this.emit(this.Events.Change,{pip:!1})};PipController.isApiEnabled()?(this.listener.on("enterpictureinpicture",e),this.listener.on("leavepictureinpicture",t)):this.listener.on("webkitpresentationmodechanged",(()=>{let i=this.listener.target.webkitPresentationMode;return()=>{"picture-in-picture"===this.listener.target.webkitPresentationMode?e():"picture-in-picture"===i&&t(),i=this.listener.target.webkitPresentationMode}})(),!0)}}destroy(){return this.exit().finally((()=>{this.removeAllListeners(),this.listener.removeAllListeners()}))}isPip(){return PipController.isApiEnabled()?document.pictureInPictureElement===this.listener.target:"picture-in-picture"===this.listener.target.webkitPresentationMode}getCurrentElement(){return this.isPip()?this.listener.target:null}request(){return new Promise(((e,t)=>{if(this.isPip())e();else{if(!PipController.isAvailable(this.listener.target))throw getPipUnavailableError();PipController.isApiEnabled()?this.listener.target.requestPictureInPicture().then((()=>e()),t):(this.listener.once("webkitpresentationmodechanged",(()=>{"picture-in-picture"===this.listener.target.webkitPresentationMode?e():t(new Error("Something went wrong."))}),!0),this.listener.target.webkitSetPresentationMode("picture-in-picture"))}}))}exit(){return new Promise(((e,t)=>{if(this.isPip()){if(!PipController.isAvailable(this.listener.target))throw getPipUnavailableError();PipController.isApiEnabled()?document.exitPictureInPicture().then(e,t):(this.listener.once("webkitpresentationmodechanged",(()=>{"picture-in-picture"!==this.listener.target.webkitPresentationMode?e():t(new Error("Something went wrong."))}),!0),this.listener.target.webkitSetPresentationMode("inline"))}else e()}))}}!function(e){let t;!function(e){e.Change="change"}(t=e.Events||(e.Events={}))}(PipController||(PipController={}));

package/loadScript.js

@@ -1 +1 @@
-import{onDOMReady}from"./onDOMReady";function isScriptAdded(e){const r=e.startsWith("//")?window.location.protocol+e:e;for(let e=0;e<document.scripts.length;e+=1)if(document.scripts[e].src===r)return!0;return!1}export function loadScript(e,{keepScript:r,id:t,async:n=!0,defer:o=!1}={}){return new Promise(((d,i)=>{onDOMReady((()=>{try{if(t){if(document.scripts.namedItem(t))return void d()}else if(isScriptAdded(e))return void d();const c=document.createElement("script"),s=()=>{c.removeEventListener("load",a),c.removeEventListener("error",p),r||c.remove()},a=()=>{s(),d()},p=e=>{s();const r=e instanceof ErrorEvent?e:new Error("Script load error. See previous log messages.");i(r)};t&&(c.id=t),c.async=n,c.defer=o,c.src=e,c.addEventListener("load",a,{once:!0}),c.addEventListener("error",p,{once:!0}),document.head.appendChild(c)}catch(e){i(e)}}))}))}
+import{onDOMReady}from"./onDOMReady";function isScriptAdded(e){const r=e.startsWith("//")?window.location.protocol+e:e;for(let e=0;e<document.scripts.length;e+=1)if(document.scripts[e].src===r)return!0;return!1}export function loadScript(e,{keepScript:r,id:t,async:n=!0,defer:o=!1}={}){return new Promise(((d,i)=>{onDOMReady((()=>{try{if(t){if(document.scripts.namedItem(t))return void d()}else if(isScriptAdded(e))return void d();const c=document.createElement("script"),s=()=>{c.removeEventListener("load",a),c.removeEventListener("error",p),r||c.remove()},a=()=>{s(),d()},p=r=>{s();const t=r instanceof ErrorEvent?r:new Error(`Unable to load script by url ${e}. See previous log messages.`,{cause:r});i(t)};t&&(c.id=t),c.async=n,c.defer=o,c.src=e,c.addEventListener("load",a,{once:!0}),c.addEventListener("error",p,{once:!0}),document.head.appendChild(c)}catch(e){i(e)}}))}))}

package/media/BaseMediaController.d.ts

@@ -0,0 +1,5 @@
+export interface BaseMediaController<T extends HTMLMediaElement = HTMLMediaElement> {
+    attach(media: T, ...args: unknown[]): void;
+    detach(): void;
+    destroy(): void;
+}

package/media/BaseMediaController.js

@@ -0,0 +1 @@
+export{};

package/media/MediaStreamController.d.ts

@@ -1,12 +1,13 @@
+import type { BaseMediaController } from './BaseMediaController';
 export declare function attachMediaStream(media: HTMLMediaElement, stream: MediaStream | undefined): void;
 export declare function removeTrack(mediaStream: MediaStream, track: MediaStreamTrack): void;
 export declare function addTrack(mediaStream: MediaStream, track: MediaStreamTrack, onEnded?: VoidFunction | undefined): void;
-export declare class MediaStreamController {
+export declare class MediaStreamController implements BaseMediaController {
     private mediaStream;
     private media;
     constructor(mediaStream: MediaStream);
-    attachMedia(media: HTMLMediaElement): void;
-    detachMedia(): void;
+    attach(media: HTMLMediaElement): void;
+    detach(): void;
     updateStream(stream: MediaStream): void;
     removeTrack(track: MediaStreamTrack): void;
     addTrack(track: MediaStreamTrack, onEnded?: VoidFunction | undefined): void;

package/media/MediaStreamController.js

@@ -1 +1 @@
-import{resetMedia}from"./resetMedia";export function attachMediaStream(e,t){t&&t.active&&e.muted&&0===t.getVideoTracks().filter((e=>!e.getSettings().displaySurface)).length?e.srcObject=null:e.srcObject=t&&t.active?t:null}export function removeTrack(e,t){e.removeTrack(t),e.dispatchEvent(new MediaStreamTrackEvent("removetrack",{track:t}))}export function addTrack(e,t,a){e.addTrack(t),e.dispatchEvent(new MediaStreamTrackEvent("addtrack",{track:t})),t.addEventListener("ended",(()=>{removeTrack(e,t),a&&a()}),{once:!0})}export class MediaStreamController{constructor(e){this.mediaStream=e}attachMedia(e){this.media=e,attachMediaStream(e,this.mediaStream)}detachMedia(){if(this.media){const{media:e}=this;this.media=void 0,resetMedia(e)}}updateStream(e){if(this.mediaStream===e)return;const{media:t}=this;this.mediaStream=e,t&&this.attachMedia(t)}removeTrack(e){removeTrack(this.mediaStream,e)}addTrack(e,t){addTrack(this.mediaStream,e,(()=>{this.removeTrack(e),t&&t()}))}reset(){this.mediaStream.getTracks().forEach((e=>{e.stop(),this.removeTrack(e)}))}destroy(){this.detachMedia(),this.reset()}}
+import{resetMedia}from"./resetMedia";export function attachMediaStream(e,t){t&&t.active&&e.muted&&0===t.getVideoTracks().filter((e=>!e.getSettings().displaySurface)).length?e.srcObject=null:e.srcObject=t&&t.active?t:null}export function removeTrack(e,t){e.removeTrack(t),e.dispatchEvent(new MediaStreamTrackEvent("removetrack",{track:t}))}export function addTrack(e,t,a){e.addTrack(t),e.dispatchEvent(new MediaStreamTrackEvent("addtrack",{track:t})),t.addEventListener("ended",(()=>{removeTrack(e,t),a&&a()}),{once:!0})}export class MediaStreamController{constructor(e){this.mediaStream=e}attach(e){this.media=e,attachMediaStream(e,this.mediaStream)}detach(){if(this.media){const{media:e}=this;this.media=void 0,resetMedia(e)}}updateStream(e){if(this.mediaStream===e)return;const{media:t}=this;this.mediaStream=e,t&&this.attach(t)}removeTrack(e){removeTrack(this.mediaStream,e)}addTrack(e,t){addTrack(this.mediaStream,e,(()=>{this.removeTrack(e),t&&t()}))}reset(){this.mediaStream.getTracks().forEach((e=>{e.stop(),this.removeTrack(e)}))}destroy(){this.detach(),this.reset()}}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@js-toolkit/web-utils",
-  "version": "1.49.0",
+  "version": "1.50.0",
   "description": "Web utils",
   "author": "VZH",
   "license": "MIT",
@@ -17,22 +17,22 @@
     "minor-publish": "npm run build && npm version minor --force --no-workspaces-update -m 'v%s' && npm run copy:configs && cd ./dist && npm publish --access public && git push --follow-tags"
   },
   "optionalDependencies": {
-    "@js-toolkit/node-utils": "^1.1.7"
+    "@js-toolkit/node-utils": "^1.2.0"
   },
   "devDependencies": {
-    "@js-toolkit/configs": "^3.88.2",
+    "@js-toolkit/configs": "^3.89.1",
     "@js-toolkit/utils": "^1.50.0",
     "@types/uuid": "^9.0.7",
-    "@typescript-eslint/eslint-plugin": "^6.14.0",
-    "@typescript-eslint/parser": "^6.14.0",
+    "@typescript-eslint/eslint-plugin": "^6.18.1",
+    "@typescript-eslint/parser": "^6.18.1",
     "copyfiles": "^2.4.1",
-    "eslint": "^8.55.0",
+    "eslint": "^8.56.0",
     "eslint-config-airbnb-base": "^15.0.0",
     "eslint-config-prettier": "^9.1.0",
-    "eslint-plugin-import": "^2.29.0",
-    "eslint-plugin-prettier": "^5.0.1",
+    "eslint-plugin-import": "^2.29.1",
+    "eslint-plugin-prettier": "^5.1.3",
     "eventemitter3": "^5.0.1",
-    "prettier": "^3.1.1",
+    "prettier": "^3.2.2",
     "reconnecting-websocket": "^4.4.0",
     "rimraf": "^5.0.5",
     "terser": "^5.26.0",

package/platform/ua.d.ts

@@ -1,4 +1,6 @@
-type UAInfo = DeepReadonly<OmitStrict<UAParser.IResult, 'withClientHints'>>;
+type UAInfo = DeepReadonly<OmitStrict<UAParser.IResult, 'withClientHints' | 'withFeatureCheck'>> & {
+    toStringObject(): Record<Keys<ExcludeKeysOfType<UAParser.IResult, AnyFunction>>, string>;
+};
 export declare function getUAInfo(): Promise<UAInfo>;
 export declare function getCachedUAInfo(): UAInfo | undefined;
 export {};

package/platform/ua.js

@@ -1 +1 @@
-import{__awaiter}from"tslib";import{UAParser}from"ua-parser-js";let result,promise;export function getUAInfo(){return __awaiter(this,void 0,void 0,(function*(){return null==result&&(promise=null!=promise?promise:Promise.resolve(new UAParser(navigator.userAgent).getResult().withClientHints()),result=yield promise,promise=void 0),result}))}export function getCachedUAInfo(){return result}
+import{__awaiter}from"tslib";import{UAParser}from"ua-parser-js";let result,promise;export function getUAInfo(){return __awaiter(this,void 0,void 0,(function*(){return null==result&&(promise=null!=promise?promise:Promise.resolve(new UAParser(navigator.userAgent).getResult().withFeatureCheck().withClientHints()),result=Object.assign(Object.assign({},yield promise),{toStringObject(){return Object.getOwnPropertyNames(this).reduce(((e,t)=>{const r=t;return null!=this[r]&&"function"!=typeof this[r]&&(e[r]=this[r].toString()),e}),{})}}),promise=void 0),result}))}export function getCachedUAInfo(){return null==result&&(console.warn("UAInfo is not ready yet."),getUAInfo()),result}