#6105 Replace 'iso-8859-2' with plain JS

extension/chrome/dev/ci_unit_test.htm

@@ -27,7 +27,6 @@ <h1 id="h1">loading..</h1>
     <script src="/lib/zxcvbn-ts.js"></script>
     <script src="/lib/zxcvbn-language-common.js"></script>
     <script src="/lib/zxcvbn-language-en.js"></script>
-    <script src="/lib/iso-8859-2.js"></script>
     <script src="/lib/forge.js"></script>
     <script src="ci_unit_test.js" type="module"></script>
   </body>

extension/chrome/elements/compose.htm

@@ -255,7 +255,6 @@ <h1 id="header_title" data-test="header-title">New Secure Message</h1>
     <script src="/lib/zxcvbn-ts.js"></script>
     <script src="/lib/zxcvbn-language-common.js"></script>
     <script src="/lib/zxcvbn-language-en.js"></script>
-    <script src="/lib/iso-8859-2.js"></script>
     <script src="/lib/forge.js"></script>
     <script src="/lib/linkify.min.js"></script>
     <script src="/lib/linkify-html.min.js"></script>

extension/chrome/settings/inbox/inbox.htm

@@ -51,7 +51,6 @@ <h1></h1>
     <script src="/lib/purify.js"></script>
     <script src="/lib/jquery.min.js"></script>
     <script src="/lib/sweetalert2.js"></script>
-    <script src="/lib/iso-8859-2.js"></script>
     <script src="/lib/emailjs/punycode.js"></script>
     <script src="/lib/emailjs/emailjs-stringencoding.js"></script>
     <script src="/lib/emailjs/emailjs-mime-codec.js"></script>

extension/js/common/core/mime.ts

@@ -4,7 +4,7 @@
 'use strict';
 
 import { Dict, Str } from './common.js';
-import { requireIso88592, requireMimeBuilder, requireMimeParser } from '../platform/require.js';
+import { requireMimeBuilder, requireMimeParser } from '../platform/require.js';
 
 import { Attachment } from './attachment.js';
 import { Buf } from './buf.js';
@@ -18,7 +18,6 @@ import { iso2022jpToUtf } from '../platform/util.js';
 /* eslint-disable @typescript-eslint/naming-convention */
 const MimeParser = requireMimeParser();
 const MimeBuilder = requireMimeBuilder();
-const Iso88592 = requireIso88592();
 /* eslint-enable @typescript-eslint/naming-convention */
 
 type AddressHeader = { address: string; name: string };
@@ -480,9 +479,12 @@ export class Mime {
   }
 
   private static getNodeContentAsUtfStr(node: MimeParserNode): string {
-    if (node.charset && Iso88592.labels.includes(node.charset)) {
-      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-      return Iso88592.decode(node.rawContent!);
+    // List of charset labels that map to ISO-8859-2
+    const iso88592Labels = ['csisolatin2', 'iso-8859-2', 'iso-ir-101', 'iso8859-2', 'iso88592', 'iso_8859-2', 'iso_8859-2:1987', 'l2', 'latin2'];
+
+    if (node.charset && node.rawContent && iso88592Labels.includes(node.charset.toLowerCase())) {
+      const decoder = new TextDecoder('iso-8859-2');
+      return decoder.decode(Buf.fromRawBytesStr(node.rawContent));
     }
     let resultBuf: Buf;
     if (node.charset === 'utf-8' && node.contentTransferEncoding.value === 'base64') {

extension/js/common/platform/require.ts

@@ -25,12 +25,6 @@ import { MimeParser } from '../core/types/emailjs.js';
 import * as openpgp from 'openpgp';
 import { Catch } from './catch.js';
 
-type Codec = {
-  encode: (text: string, mode: 'fatal' | 'html') => string;
-  decode: (text: string) => string;
-  labels: string[];
-  version: string;
-};
 
 export const requireOpenpgp = () => {
   if (typeof window !== 'undefined' && typeof globalThis !== 'undefined' && window !== globalThis && Catch.browser().name === 'firefox') {
@@ -52,8 +46,3 @@ export const requireMimeParser = (): typeof MimeParser => {
 export const requireMimeBuilder = () => {
   return (globalThis as any)['emailjs-mime-builder']; // eslint-disable-line
 };
-
-export const requireIso88592 = (): Codec => {
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-member-access
-  return (globalThis as any).iso88592 as Codec;
-};

extension/manifest.json

@@ -48,7 +48,6 @@
         "/lib/sweetalert2.js",
         "/lib/streams_web.js",
         "/lib/emailjs/punycode.js",
-        "/lib/iso-8859-2.js",
         "/lib/trusted-types.js",
         "/lib/emailjs/emailjs-stringencoding.js",
         "/lib/emailjs/emailjs-mime-codec.js",

package.json

@@ -53,7 +53,6 @@
     "filesize": "11.0.13",
     "fs-extra": "^11.3.2",
     "globby": "^15.0.0",
-    "iso-8859-2": "1.0.0",
     "jquery": "3.7.1",
     "linkify-html": "4.3.2",
     "linkifyjs": "4.3.2",

scripts/build.js

@@ -57,7 +57,6 @@ const copyDependencies = async () => {
     ['linkify-html/dist/linkify-html.min.js', 'lib/linkify-html.min.js'],
     ['sweetalert2/dist/sweetalert2.js', 'lib/sweetalert2.js'],
     ['sweetalert2/dist/sweetalert2.css', 'css/sweetalert2.css'],
-    ['iso-8859-2/iso-8859-2.js', 'lib/iso-8859-2.js'],
     ['@zxcvbn-ts/core/dist/zxcvbn-ts.js', 'lib/zxcvbn-ts.js'],
     ['@zxcvbn-ts/language-common/dist/zxcvbn-ts.js', 'lib/zxcvbn-language-common.js'],
     ['@zxcvbn-ts/language-en/dist/zxcvbn-ts.js', 'lib/zxcvbn-language-en.js'],

test/source/platform/require.ts

@@ -21,8 +21,4 @@ export const requireMimeBuilder = (): any => {
   return undefined; // todo
 };
 
-export const requireIso88592 = (): any => {
-  // (window as any).iso88592
-  return undefined; // todo
-};
 /* eslint-enable @typescript-eslint/no-explicit-any */

tsconfig.json

@@ -24,7 +24,6 @@
       "dompurify": ["../node_modules/dompurify/dist/purify.cjs.d.ts", "lib/purify.js", "COMMENT"],
       "fine-uploader": ["lib/fine-uploader.js", "COMMENT"],
       "filesize": ["lib/filesize.js", "../node_modules/filesize/types/filesize.d.ts"],
-      "iso-8859-2": ["lib/iso-8859-2.js", "COMMENT"],
       "emailjs-mime-parser": ["lib/emailjs/emailjs-mime-parser.js", "COMMENT"],
       "emailjs-mime-builder": ["lib/emailjs/emailjs-mime-builder.js", "COMMENT"],
       "node-forge": ["./extension/types/node-forge.d.ts", "lib/forge.mjs"],