@sswroom/sswr 1.5.4 → 1.6.0

package/text.js

@@ -216,8 +216,76 @@ export function toHex16(v)
 
 export function toHex32(v)
 {
-	let s = (v & 0xffffffff).toString(16);
-	return "0".repeat(8 - s.length)+s;
+	return toHex16(v >> 16) + toHex16(v);
+}
+
+export function u8Arr2Hex(buff, byteSep, rowSep)
+{
+	let rows = [];
+	let thisRow = [];
+	let i = 1;
+	let j = buff.length;
+	if (j == 0)
+		return "";
+	if (byteSep == null)
+		byteSep = "";
+	thisRow.push(toHex8(buff[0]));
+	while (i < j)
+	{
+		if ((i & 15) == 0)
+		{
+			rows.push(thisRow.join(byteSep));
+			thisRow = [];
+		}
+		thisRow.push(toHex8(buff[i]));
+		i++;
+	}
+	rows.push(thisRow.join(byteSep));
+	if (rowSep == null)
+		rowSep = byteSep;
+	return rows.join(rowSep);
+}
+
+export function splitLines(txt)
+{
+	let lines = [];
+	let pos = 0;
+	let i;
+	let j;
+	while (true)
+	{
+		i = txt.indexOf("\r", pos);
+		j = txt.indexOf("\n", pos);
+		if (i == -1 && j == -1)
+		{
+			lines.push(txt.substring(pos));
+			break;
+		}
+		else if (i == -1)
+		{
+			lines.push(txt.substring(pos, j));
+			pos = j + 1;
+		}
+		else if (j == -1)
+		{
+			lines.push(txt.substring(pos, i));
+			pos = i + 1;
+		}
+		else if (i < j)
+		{
+			lines.push(txt.substring(pos, i));
+			if (j == i + 1)
+				pos = j + 1;
+			else
+				pos = i + 1;
+		}
+		else
+		{
+			lines.push(txt.substring(pos, j));
+			pos = j + 1;
+		}
+	}
+	return lines;
 }
 
 export function getEncList()

package/unit.d.ts

@@ -83,6 +83,8 @@ export class Count
 	static getUnitInfo(u: Count.Unit): UnitInfo<Count.Unit> | null;
 	static getUnitRatio(u: Count.Unit) : number;
 	static convert(fromUnit: Count.Unit, toUnit: Count.Unit, fromValue: number): number;
+	static wellFormat(val: number, nDecimal?: number): string;
+	static wellFormatBin(val: number, nDecimal?: number): string;
 }
 
 module Distance

package/unit.js

@@ -1,3 +1,5 @@
+import * as math from "./math.js";
+
 export class UnitInfo
 {
 	constructor(unit, symbol, name, ratio, scale)
@@ -216,6 +218,114 @@ export class Count
 	{
 		return fromValue * ApparentPower.getUnitRatio(fromUnit) / ApparentPower.getUnitRatio(toUnit);
 	}
+
+	static wellFormat(val, nDecimal)
+	{
+		if (nDecimal == null || nDecimal < 1)
+			nDecimal = 2;
+		let lval = Math.log10(val);
+		if (lval < 0)
+		{
+			if (lval >= -2)
+			{
+				return math.roundToStr(val * 100, nDecimal)+"c";
+			}
+			else if (lval >= -3)
+			{
+				return math.roundToStr(val * 1000, nDecimal)+"m";
+			}
+			else if (lval >= -6)
+			{
+				return math.roundToStr(val * 1000000, nDecimal)+"u";
+			}
+			else if (lval >= -9)
+			{
+				return math.roundToStr(val * 1.0e9, nDecimal)+"n";
+			}
+			else if (lval >= -12)
+			{
+				return math.roundToStr(val * 1.0e12, nDecimal)+"p";
+			}
+			else if (lval >= -15)
+			{
+				return math.roundToStr(val * 1.0e15, nDecimal)+"f";
+			}
+			else if (lval >= -18)
+			{
+				return math.roundToStr(val * 1.0e18, nDecimal)+"a";
+			}
+			else if (lval >= -21)
+			{
+				return math.roundToStr(val * 1.0e21, nDecimal)+"z";
+			}
+			else
+			{
+				return math.roundToStr(val * 1.0e24, nDecimal)+"y";
+			}
+		}
+		else if (lval < 3)
+		{
+			return math.roundToStr(val, nDecimal);
+		}
+		else if (lval < 6)
+		{
+			return math.roundToStr(val / 1.0e3, nDecimal)+"k";
+		}
+		else if (lval < 9)
+		{
+			return math.roundToStr(val / 1.0e6, nDecimal)+"M";
+		}
+		else if (val < 12)
+		{
+			return math.roundToStr(val / 1.0e9, nDecimal)+"G";
+		}
+		else if (val < 15)
+		{
+			return math.roundToStr(val / 1.0e12, nDecimal)+"T";
+		}
+		else if (val < 18)
+		{
+			return math.roundToStr(val / 1.0e15, nDecimal)+"P";
+		}
+		else if (val < 21)
+		{
+			return math.roundToStr(val / 1.0e18, nDecimal)+"E";
+		}
+		else if (val < 24)
+		{
+			return math.roundToStr(val / 1.0e21, nDecimal)+"Z";
+		}
+		else
+		{
+			return math.roundToStr(val / 1.0e24, nDecimal)+"Y";
+		}
+	}
+
+	static wellFormatBin(val, nDecimal)
+	{
+		if (nDecimal == null || nDecimal < 1)
+			nDecimal = 2;
+		if (val < 1024)
+		{
+			return math.roundToStr(val, nDecimal);
+		}
+		else if (val < 1048576)
+		{
+			return math.roundToStr(val / 1024, nDecimal)+"Ki";
+		}
+		else if (val < 1073741824)
+		{
+			return math.roundToStr(val / 1048576, nDecimal)+"Mi";
+		}
+		else if (val < 1099511627776)
+		{
+			return math.roundToStr(val / 1073741824, nDecimal)+"Gi";
+		}
+		else
+		{
+			return math.roundToStr(val / 1099511627776, nDecimal)+"Ti";
+		}
+	}
 }
 
 export class Distance

package/web.d.ts

@@ -16,13 +16,15 @@ export function getRequestURLBase(): string;
 export function getParameterByName(name: string): string | null;
 export function loadJSON(url: string, onResultFunc: Function): void;
 export function buildTable(o: object | object[]): string;
-export function openData(data: string, contentType: string, fileName?: string): void;
+export function openData(data: string | Blob, contentType: string, fileName?: string): void;
 export function parseCSSColor(c: string): Color;
 export function handleFileDrop(ele: HTMLElement, hdlr: (file: File)=>void): void;
 export function appendUrl(targetUrl: string, docUrl: string): string;
 export function mimeFromFileName(fileName: string): string;
 export function mimeFromExt(ext: string): string;
 export function getImageInfo(url: string): Promise<ImageInfo|null>;
+export function propertiesToHTML(prop: object): string;
+export function getCacheSize(name: string): Promise<number>;
 
 declare class DialogButton
 {

package/web.js

@@ -95,6 +95,18 @@ export function openData(data, contentType, fileName)
 			ele.setAttribute('download', fileName);
 		ele.style.display = 'none';
 
+		document.body.appendChild(ele);
+		ele.click();
+		document.body.removeChild(ele);
+	}
+	else if (data instanceof Blob)
+	{
+		let ele = document.createElement("a");
+		ele.setAttribute('href', URL.createObjectURL(data));
+		if (fileName)
+			ele.setAttribute('download', fileName);
+		ele.style.display = 'none';
+
 		document.body.appendChild(ele);
 		ele.click();
 		document.body.removeChild(ele);
@@ -709,6 +721,44 @@ export function getImageInfo(url)
     });
 }
 
+export function propertiesToHTML(prop)
+{
+	let ret = ["<ul>"];
+	let i;
+	for (i in prop)
+	{
+		ret.push("<li><b>"+text.toHTMLText(i)+": </b>");
+		if (typeof prop[i] == "object")
+		{
+			ret.push(propertiesToHTML(prop[i]));
+		}
+		else
+		{
+			ret.push(text.toHTMLText(""+prop[i]));
+		}
+		ret.push("</li>");
+	}
+	ret.push("</ul>");
+	return ret.join("");
+}
+
+export async function getCacheSize(name)
+{
+	const cache = await caches.open(name);
+	const keys = await cache.keys();
+	let i;
+	let size = 0;
+	for (i in keys)
+	{
+		let resp = await cache.match(keys[i]);
+		if (resp)
+		{
+			size += (await resp.arrayBuffer()).byteLength;
+		}
+	}
+	return size;
+}
+
 export class Dialog
 {
 	constructor(content, options)
@@ -739,10 +789,10 @@ export class Dialog
 		darkColor.style.display = "flex";
 		darkColor.style.alignItems = "center";
 		darkColor.style.justifyContent = "center";
-		if (document.body.children.length > 0)
-			document.body.insertBefore(darkColor, document.body.children[0]);
+		if (top.document.body.children.length > 0)
+			top.document.body.insertBefore(darkColor, top.document.body.children[0]);
 		else
-			document.body.appendChild(darkColor);
+			top.document.body.appendChild(darkColor);
 		this.darkColor = darkColor;
 		let dialog = document.createElement("div");
 		dialog.style.backgroundColor = "#ffffff";
@@ -818,7 +868,7 @@ export class Dialog
 	{
 		if (this.darkColor)
 		{
-			document.body.removeChild(this.darkColor);
+			top.document.body.removeChild(this.darkColor);
 			this.darkColor = null;
 		}
 	}