@sswroom/sswr 1.5.5 → 1.6.1

package/parser.js

@@ -1,3 +1,5 @@
+import * as cert from "./cert.js";
+import { ASN1Util } from "./certutil.js";
 import * as data from "./data.js";
 import * as geometry from "./geometry.js";
 import * as kml from "./kml.js";
@@ -793,7 +795,7 @@ function parseKMLNode(kmlNode, doc)
 	}
 }
 
-async function parseJpg(reader)
+async function parseJpg(reader, sourceName)
 {
 	if (!(reader instanceof data.ByteReader))
 		return null;
@@ -923,7 +925,7 @@ async function parseJpg(reader)
 		let buff = reader.getArrayBuffer();
 		let b = new Blob([buff], {type: "image/jpeg"});
 		let img = await media.loadImageFromBlob(b);
-		let simg = new media.StaticImage(img);
+		let simg = new media.StaticImage(img, sourceName, "image/jpeg");
 		if (exif)
 			simg.setExif(exif);
 		return simg;
@@ -931,7 +933,7 @@ async function parseJpg(reader)
 	return null;
 }
 
-async function parseWebp(reader)
+async function parseWebp(reader, sourceName)
 {
 	if (!(reader instanceof data.ByteReader))
 		return null;
@@ -942,11 +944,238 @@ async function parseWebp(reader)
 	let buff = reader.getArrayBuffer();
 	let b = new Blob([buff], {type: "image/webp"});
 	let img = await media.loadImageFromBlob(b);
-	let simg = new media.StaticImage(img);
+	let simg = new media.StaticImage(img, sourceName, "image/webp");
 	return simg;
 }
 
-export function parseXML(txt)
+function parseX509(reader, fileName, mime)
+{
+	if (!(reader instanceof data.ByteReader))
+		return null;
+	let initTxt;
+	let initOfst = 0;
+	if (reader.readUInt8(0) == 0xef && reader.readUInt8(1) == 0xbb && reader.readUInt8(2) == 0xbf)
+	{
+		initOfst = 3;
+	}
+	initTxt = reader.readUTF8(initOfst, 5);
+	if (initTxt == "-----")
+	{
+		let files = [];
+		let lines = text.splitLines(reader.readUTF8(initOfst, reader.getLength() - initOfst));
+		let i = 0;
+		let j = lines.length;
+		while (i < j)
+		{
+			if (lines[i] == "-----BEGIN CERTIFICATE-----")
+			{
+				let b64 = [];
+				i++;
+				while (true)
+				{
+					if (i >= j)
+						return null;
+					if (lines[i] == "-----END CERTIFICATE-----")
+					{
+						break;
+					}
+					else
+					{
+						b64.push(lines[i]);
+					}
+					i++;
+				}
+				files.push(new cert.X509Cert(fileName, new text.Base64Enc().decodeBin(b64.join("")).buffer));
+			}
+			else if (lines[i] == "-----BEGIN RSA PRIVATE KEY-----")
+			{
+				let b64 = [];
+				let enc = false;
+				i++;
+				while (true)
+				{
+					if (i >= j)
+						return null;
+					if (lines[i] == "-----END RSA PRIVATE KEY-----")
+					{
+						break;
+					}
+					else if (lines[i].startsWith("Proc-Type:"))
+					{
+						enc = true;
+					}
+					else
+					{
+						b64.push(lines[i]);
+					}
+					i++;
+				}
+				files.push(new cert.X509Key(fileName, new text.Base64Enc().decodeBin(b64.join("")).buffer, cert.KeyType.RSA));
+			}
+			else if (lines[i] == "-----BEGIN DSA PRIVATE KEY-----")
+			{
+				let b64 = [];
+				i++;
+				while (true)
+				{
+					if (i >= j)
+						return null;
+					if (lines[i] == "-----END DSA PRIVATE KEY-----")
+					{
+						break;
+					}
+					else
+					{
+						b64.push(lines[i]);
+					}
+					i++;
+				}
+				files.push(new cert.X509Key(fileName, new text.Base64Enc().decodeBin(b64.join("")).buffer, cert.KeyType.DSA));
+			}
+			else if (lines[i] == "-----BEGIN EC PRIVATE KEY-----")
+			{
+				let b64 = [];
+				i++;
+				while (true)
+				{
+					if (i >= j)
+						return null;
+					if (lines[i] == "-----END EC PRIVATE KEY-----")
+					{
+						break;
+					}
+					else
+					{
+						b64.push(lines[i]);
+					}
+					i++;
+				}
+				files.push(new cert.X509Key(fileName, new text.Base64Enc().decodeBin(b64.join("")).buffer, cert.KeyType.ECDSA));
+			}
+			else if (lines[i] == "-----BEGIN PRIVATE KEY-----")
+			{
+				let b64 = [];
+				i++;
+				while (true)
+				{
+					if (i >= j)
+						return null;
+					if (lines[i] == "-----END PRIVATE KEY-----")
+					{
+						break;
+					}
+					else
+					{
+						b64.push(lines[i]);
+					}
+					i++;
+				}
+				files.push(new cert.X509PrivKey(fileName, new text.Base64Enc().decodeBin(b64.join("")).buffer));
+			}
+			else if (lines[i] == "-----BEGIN PUBLIC KEY-----")
+			{
+				let b64 = [];
+				i++;
+				while (true)
+				{
+					if (i >= j)
+						return null;
+					if (lines[i] == "-----END PUBLIC KEY-----")
+					{
+						break;
+					}
+					else
+					{
+						b64.push(lines[i]);
+					}
+					i++;
+				}
+				files.push(new cert.X509PubKey(fileName, new text.Base64Enc().decodeBin(b64.join("")).buffer));
+			}
+			else if (lines[i] == "-----BEGIN CERTIFICATE REQUEST-----")
+			{
+				let b64 = [];
+				i++;
+				while (true)
+				{
+					if (i >= j)
+						return null;
+					if (lines[i] == "-----END CERTIFICATE REQUEST-----")
+					{
+						break;
+					}
+					else
+					{
+						b64.push(lines[i]);
+					}
+					i++;
+				}
+				files.push(new cert.X509CertReq(fileName, new text.Base64Enc().decodeBin(b64.join("")).buffer));
+			}
+			else if (lines[i] == "-----BEGIN NEW CERTIFICATE REQUEST-----")
+			{
+				let b64 = [];
+				i++;
+				while (true)
+				{
+					if (i >= j)
+						return null;
+					if (lines[i] == "-----END NEW CERTIFICATE REQUEST-----")
+					{
+						break;
+					}
+					else
+					{
+						b64.push(lines[i]);
+					}
+					i++;
+				}
+				files.push(new cert.X509CertReq(fileName, new text.Base64Enc().decodeBin(b64.join("")).buffer));
+			}
+			i++;
+		}
+		if (files.length == 1)
+		{
+			return files[0];
+		}
+		else if (files.length > 1)
+		{
+			let fileList = new cert.X509FileList(fileName, files[0]);
+			let i = 1;
+			while (i < files.length)
+			{
+				fileList.addFile(files[i]);
+				i++;
+			}
+			return fileList;
+		}
+		console.log("Unsupported file", fileName, mime);
+	}
+	else if (reader.readUInt8(0) == 0x30 && ASN1Util.pduIsValid(reader, 0, reader.getLength()))
+	{
+		fileName = fileName.toUpperCase();
+		console.log(mime);
+		if (mime == "application/x-pkcs12" || fileName.endsWith(".P12") || fileName.endsWith(".PFX"))
+		{
+			return new cert.X509PKCS12(fileName, reader.getArrayBuffer());
+		}
+		else if (mime == "application/x-x509-ca-cert" || mime == "application/x-x509-user-cert" || mime == "application/pkix-cert" || fileName.endsWith(".DER") || fileName.endsWith(".CER") || fileName.endsWith(".CRT"))
+		{
+			return new cert.X509Cert(fileName, reader.getArrayBuffer());
+		}
+		else if (mime == "application/x-pkcs7-certificates" || fileName.endsWith(".P7B") || fileName.endsWith(".P7S"))
+		{
+			return new cert.X509PKCS7(fileName, reader.getArrayBuffer());
+		}
+		else if (mime == "application/pkix-crl" || fileName.endsWith(".CRL"))
+		{
+			return new cert.X509CRL(fileName, reader.getArrayBuffer());
+		}
+	}
+	return null;
+}
+
+export function parseXML(txt, sourceName)
 {
 	let parser = new DOMParser();
 	let xmlDoc = parser.parseFromString(txt, "application/xml");
@@ -964,7 +1193,17 @@ export function parseXML(txt)
 				for (kmlNode of xmlRoot.childNodes)
 				{
 					if (kmlNode.nodeName != "#text")
-						return parseKMLNode(kmlNode);
+					{
+						let feature = parseKMLNode(kmlNode);
+						if (feature)
+						{
+							return new kml.KMLFile(feature, sourceName);
+						}
+						else
+						{
+							return null;
+						}
+					}
 				}
 			}
 			else
@@ -988,14 +1227,15 @@ export async function parseFile(file)
 
 	if (t == "application/vnd.google-earth.kml+xml")
 	{
-		return parseXML(await file.text());
+		return parseXML(await file.text(), file.name);
 	}
 	else
 	{
 		let view = new data.ByteReader(await file.arrayBuffer());
 		let obj;
-		if (obj = await parseJpg(view)) return obj;
-		if (obj = await parseWebp(view)) return obj;
+		if (obj = await parseJpg(view, file.name)) return obj;
+		if (obj = await parseWebp(view, file.name)) return obj;
+		if (obj = parseX509(view, file.name, t)) return obj;
 		console.log("Unsupported file type", t);
 		return null;
 	}

package/text.d.ts

@@ -10,10 +10,11 @@ export enum LineBreakType
 	CR,
 	LF,
 	CRLF
-};
+}
 
 export function zeroPad(val: string | number, ndigits: number): string;
 export function isInteger(s: string): boolean;
+export function isUInteger(s: string): boolean;
 export function toJSText(s: string): string;
 export function toXMLText(s: string): string;
 export function toAttrText(s: string): string;
@@ -24,6 +25,14 @@ export function toHex8(v: number): string;
 export function toHex16(v: number): string;
 export function toHex32(v: number): string;
 export function u8Arr2Hex(buff: Uint8Array, byteSep: string, rowSep: string): string;
+export function splitLines(txt: string): string[];
+export function isEmailAddress(s: string): boolean;
+export function toUTF32Length(s: string): number;
+export function isHKID(s: string): boolean;
+export function charIsAlphaNumeric(s: string, index: number): boolean;
+export function charIsDigit(s: string, index: number): boolean;
+export function charIsUpperCase(s: string, index: number): boolean;
+export function charIsLowerCase(s: string, index: number): boolean;
 export function getEncList(): TextBinEnc[];
 
 export class TextBinEnc

package/text.js

@@ -42,6 +42,25 @@ export function isInteger(s)
 	return true;
 }
 
+export function isUInteger(s)
+{
+	if (s === null)
+		return false;
+	let j = s.length;
+	if (j == 0)
+		return false;
+	let i = 0;
+	let c;
+	while (i < j)
+	{
+		c = s.charCodeAt(i);
+		if (c < 0x30 || c > 0x39)
+			return false;
+		i++;
+	}
+	return true;
+}
+
 export function toJSText(s)
 {
 	let out = "\"";
@@ -216,8 +235,7 @@ 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)
@@ -247,6 +265,270 @@ export function u8Arr2Hex(buff, byteSep, rowSep)
 	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 isEmailAddress(s)
+{
+	let atPos = -1;
+	let dotIndex = -1;
+	let c;
+	let i = 0;
+	let j = s.length;
+	while (i < j)
+	{
+		c = s.charAt(i);
+		if (charIsAlphaNumeric(s, i) || c == '-')
+		{
+
+		}
+		else if (c == '.')
+		{
+			if (atPos != -1)
+			{
+				dotIndex = i;
+			}
+		}
+		else if (c == '@')
+		{
+			if (atPos != -1)
+			{
+				return false;
+			}
+			atPos = i;
+			dotIndex = -1;
+		}
+		else
+		{
+			return false;
+		}
+		i++;
+	}
+	if (atPos == -1 || atPos == 0 || dotIndex == -1 || (j - dotIndex) < 2)
+	{
+		return false;
+	}
+	return true;
+}
+
+export function toUTF32Length(s)
+{
+	let i = 0;
+	let j = s.length;
+	let ret = 0;
+	while (i < j)
+	{
+		if (i + 1 < j)
+		{
+			let c1 = s.charCodeAt(i);
+			let c2 = s.charCodeAt(i + 1);
+			if (c1 >= 0xd800 && c1 < 0xdc00 && c2 >= 0xdc00 && c2 < 0xe000)
+			{
+				i += 2;
+			}
+			else
+			{
+				i++;
+			}
+		}
+		else
+		{
+			i++;
+		}
+		ret++;
+	}
+	return ret;
+}
+
+export function isHKID(s)
+{
+	let hkid;
+	let chk;
+	let ichk;
+	if (s.endsWith(')'))
+	{
+		if (s.length == 10)
+		{
+			if (s.charAt(7) == '(')
+			{
+				hkid = s.substring(0, 7);
+				chk = s.charAt(8);
+			}
+			else
+			{
+				return false;
+			}
+		}
+		else if (s.length == 11)
+		{
+			if (s.charAt(8) == '(')
+			{
+				hkid = s.substring(0, 8);
+				chk = s.charAt(9);
+			}
+			else
+			{
+				return false;
+			}
+		}
+		else
+		{
+			return false;
+		}
+	}
+	else
+	{
+		if (s.length == 8)
+		{
+			hkid = s.substring(0, 7);
+			chk = s.charAt(7);
+		}
+		else if (s.length == 9)
+		{
+			hkid = s.substring(0, 8);
+			chk = s.charAt(8);
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	if (charIsDigit(chk, 0))
+		ichk = Number.parseInt(chk);
+	else if (chk == 'A')
+		ichk = 10;
+	else
+	{
+		return false;
+	}
+
+	let thisChk;
+	if (hkid.length == 8)
+	{
+		if (!charIsUpperCase(hkid, 0) ||
+			!charIsUpperCase(hkid, 1) ||
+			!charIsDigit(hkid, 2) ||
+			!charIsDigit(hkid, 3) ||
+			!charIsDigit(hkid, 4) ||
+			!charIsDigit(hkid, 5) ||
+			!charIsDigit(hkid, 6) ||
+			!charIsDigit(hkid, 7))
+				return false;
+		
+		thisChk = 0;
+		thisChk += (hkid.charCodeAt(0) - 0x41 + 10) * 9;
+		thisChk += (hkid.charCodeAt(1) - 0x41 + 10) * 8;
+		thisChk += (hkid.charCodeAt(2) - 0x30) * 7;
+		thisChk += (hkid.charCodeAt(3) - 0x30) * 6;
+		thisChk += (hkid.charCodeAt(4) - 0x30) * 5;
+		thisChk += (hkid.charCodeAt(5) - 0x30) * 4;
+		thisChk += (hkid.charCodeAt(6) - 0x30) * 3;
+		thisChk += (hkid.charCodeAt(7) - 0x30) * 2;
+		if (ichk != (thisChk % 11))
+			return false;
+		return true;
+	}
+	else
+	{
+		if (!charIsUpperCase(hkid, 0) ||
+			!charIsDigit(hkid, 1) ||
+			!charIsDigit(hkid, 2) ||
+			!charIsDigit(hkid, 3) ||
+			!charIsDigit(hkid, 4) ||
+			!charIsDigit(hkid, 5) ||
+			!charIsDigit(hkid, 6))
+				return false;
+
+		thisChk = 36 * 9;
+		thisChk += (hkid.charCodeAt(0) - 0x41 + 10) * 8;
+		thisChk += (hkid.charCodeAt(1) - 0x30) * 7;
+		thisChk += (hkid.charCodeAt(2) - 0x30) * 6;
+		thisChk += (hkid.charCodeAt(3) - 0x30) * 5;
+		thisChk += (hkid.charCodeAt(4) - 0x30) * 4;
+		thisChk += (hkid.charCodeAt(5) - 0x30) * 3;
+		thisChk += (hkid.charCodeAt(6) - 0x30) * 2;
+		if (ichk != (thisChk % 11))
+			return false;
+		return true;
+	}
+}
+
+export function charIsAlphaNumeric(s, index)
+{
+	let c = s.charCodeAt(index);
+	if (c >= 0x30 && c <= 0x39)
+		return true;
+	if (c >= 0x41 && c <= 0x5A)
+		return true;
+	if (c >= 0x61 && c <= 0x7A)
+		return true;
+	return false;
+}
+
+export function charIsDigit(s, index)
+{
+	let c = s.charCodeAt(index);
+	if (c >= 0x30 && c <= 0x39)
+		return true;
+	return false;
+}
+
+export function charIsUpperCase(s, index)
+{
+	let c = s.charCodeAt(index);
+	if (c >= 0x41 && c <= 0x5A)
+		return true;
+	return false;
+}
+
+export function charIsLowerCase(s, index)
+{
+	let c = s.charCodeAt(index);
+	if (c >= 0x61 && c <= 0x7A)
+		return true;
+	return false;
+}
+
 export function getEncList()
 {
 	let ret = [];

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