macro-parameters 0.0.5 → 0.0.6

package/README.md

@@ -0,0 +1,22 @@
+# macro-parameters
+
+  macro-parameters is a JavaScript library for replacing‌ device placeholders
+
+
+
+# Usage
+
+
+
+```
+import MacroSubstitution from "macro-parameters";
+
+const obj = new MacroSubstitution();
+obj.set({
+    player_height: "1280",
+    player_width: "720",
+});
+obj.handle("https://test-streams.mux.dev/x36xhzz/x36xhzz.m3u8?ads.cb=[rnd]&ads.ua=[device_user_agent]&player_height=[player_height]&player_width=[player_width]")
+```
+
+# API

package/index.js

@@ -1,66 +1,60 @@
-function getCookie(name) {
-    const reg = new RegExp("(^| )" + name + "=([^;]*)(;|$)");
-    let arr;
-    let source =
-        document.cookie ||
-        (window.localStorage && window.localStorage.cookie) ||
-        "";
-    return (arr = source.match(reg)) ? unescape(arr[2]) : "";
-}
-
-function getLocalStorage(name) {
-    if (typeof localStorage === "object") {
-        return localStorage.getItem(name)
-    }
-    return null;
-}
-function getTvBrand() {
-    if (localStorage.getItem("brand")) {//TODO: 处理whaleos的一些特殊情况,后期可以考虑去除
-        return localStorage.getItem("brand");
-    }
-    var userAgent = navigator.userAgent.toUpperCase();
-    var _tvBrand = "others";
-    if (userAgent.indexOf("AOC") > -1) {
-        _tvBrand = "aoc";
-    } else if (userAgent.indexOf("PHILIPS") > -1) {
-        _tvBrand = "philips";
-    } else {
-        _tvBrand = "others";
-    }
-    return _tvBrand;
-}
-
-function getProfileId() {
-    //Get the profile id from cookie
-    var _profileId = getCookie("profileid") || getCookie("profileId");
-    var items = [];
-    if (_profileId && _profileId != "") {
-        // if profile id exists split it with underscore
-        items = _profileId.split("_");
-        return items[1];
-    } else {
-        return "Unknown";
-    }
-}
-
-function setCookie(name, value, expires, path, domain, secure) {
-    var cookieString =
-      name +
-      "=" +
-      escape(value) +
-      (expires ? ";expires=" + expires.toGMTString() : "") +
-      ("") +
-      ("") +
-      ("");
-    document.cookie = cookieString;
-  }
-
-  function getLocationOrigin() {
-    return (
-        location.origin ||
-        `${location.protocol}//${location.host || location.hostname}${location.port
-        }`
-    );
+function getCookie(name) {
+    var reg = new RegExp("(^| )" + name + "=([^;]*)(;|$)");
+    var arr;
+    var source = document.cookie ||
+        (window.localStorage && window.localStorage.cookie) ||
+        "";
+    return (arr = source.match(reg)) ? unescape(arr[2]) : "";
+}
+function getLocalStorage(name) {
+    if (typeof localStorage === "object") {
+        return localStorage.getItem(name);
+    }
+    return null;
+}
+function getTvBrand() {
+    if (localStorage.getItem("brand")) { //TODO: 处理whaleos的一些特殊情况,后期可以考虑去除
+        return localStorage.getItem("brand");
+    }
+    var userAgent = navigator.userAgent.toUpperCase();
+    var _tvBrand = "others";
+    if (userAgent.indexOf("AOC") > -1) {
+        _tvBrand = "aoc";
+    }
+    else if (userAgent.indexOf("PHILIPS") > -1) {
+        _tvBrand = "philips";
+    }
+    else {
+        _tvBrand = "others";
+    }
+    return _tvBrand;
+}
+function getProfileId() {
+    //Get the profile id from cookie
+    var _profileId = getCookie("profileid") || getCookie("profileId");
+    var items = [];
+    if (_profileId && _profileId != "") {
+        // if profile id exists split it with underscore
+        items = _profileId.split("_");
+        return items[1];
+    }
+    else {
+        return "Unknown";
+    }
+}
+function setCookie(name, value, expires, path, domain, secure) {
+    var cookieString = name +
+        "=" +
+        escape(value) +
+        (expires ? ";expires=" + expires.toGMTString() : "") +
+        ("") +
+        ("") +
+        ("");
+    document.cookie = cookieString;
+}
+function getLocationOrigin() {
+    return (location.origin ||
+        "".concat(location.protocol, "//").concat(location.host || location.hostname).concat(location.port));
 }
 
 function cleanPlaceholder(str, params) {
@@ -110,7 +104,7 @@ var PlaceHolders = {
         // if (isWhaleOSGlobal) {
         //     return "true"
         // }
-        var reladvertStatus = false;
+        var reladvertStatus = "false";
         var userAgent = navigator.userAgent.toUpperCase();
         if (userAgent.indexOf("AOC") > -1) {
             reladvertStatus = getCookie("relAdvert");
@@ -118,7 +112,7 @@ var PlaceHolders = {
         else {
             reladvertStatus = getCookie("relAdvert");
         }
-        reladvertStatus = reladvertStatus == null ? false : reladvertStatus;
+        reladvertStatus = reladvertStatus == null ? "false" : reladvertStatus;
         return reladvertStatus;
     },
     "[device_dnt]": function () {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "macro-parameters",
-  "version": "0.0.5",
+  "version": "0.0.6",
   "description": "Provide unified macro parameter retrieval",
   "main": "index.js",
   "scripts": {

package/script/{utils.js → utils.ts}

@@ -43,17 +43,23 @@ export function getProfileId() {
     }
 }
 
-export function setCookie(name, value, expires, path, domain, secure) {
+export function setCookie(
+    name: string,
+    value: string,
+    expires?: any,
+    path?: string | undefined,
+    domain?: string | undefined,
+    secure?: string | undefined) {
     var cookieString =
-      name +
-      "=" +
-      escape(value) +
-      (expires ? ";expires=" + expires.toGMTString() : "") +
-      (path ? ";path=" + path : "") +
-      (domain ? ";domain=" + domain : "") +
-      (secure ? ";secure" : "");
+        name +
+        "=" +
+        escape(value) +
+        (expires ? ";expires=" + expires.toGMTString() : "") +
+        (path ? ";path=" + path : "") +
+        (domain ? ";domain=" + domain : "") +
+        (secure ? ";secure" : "");
     document.cookie = cookieString;
-  }
+}
 
   export function getLocationOrigin() {
     return (

package/src/replace.ts

@@ -55,15 +55,15 @@ const PlaceHolders: any = {
         // if (isWhaleOSGlobal) {
         //     return "true"
         // }
-        var reladvertStatus = false;
-        var userAgent = navigator.userAgent.toUpperCase();
+        let reladvertStatus = "false";
+        const userAgent = navigator.userAgent.toUpperCase();
         if (userAgent.indexOf("AOC") > -1) {
             reladvertStatus = getCookie("relAdvert");
         } else {
             reladvertStatus = getCookie("relAdvert");
         }
 
-        reladvertStatus = reladvertStatus == null ? false : reladvertStatus;
+        reladvertStatus = reladvertStatus == null ? "false" : reladvertStatus;
         return reladvertStatus;
     },
     "[device_dnt]"() {