Display error/warning for too large input #72

src/_locales/en/messages.json

@@ -80,6 +80,10 @@
  "message": "Permission request failed.",
  "description": "Error shown when a permission request failed. This indicates a technical error and does NOT mean the user declined the permission."
  },
+ "errorQrCodeOverflow": {
+ "message": "Cannot generate QR code, the provided text is too much.",
+ "description": "Error shown when QR code cannot be generated due to overflow in input size."
+ },
  "requestDownloadPermissionForQr": {
  "message": "To continue to save the QR code, we need the download permission.",
  "description": "Shown, when the user is asked to allow the download permission to save the QR code."

src/popup/modules/QrLib/QrError.js

@@ -0,0 +1,13 @@
+/**
+ * Errors in QR code generation
+ *
+ * @module QrLib/QrErrors
+ */
+
+export class DataOverflowError extends Error {
+ constructor(...rparams) {
+ let params = rparams.length>0
+ ? rparams : ["The QR code was given too much data."];
+ super(...params);
+ }
+}

src/popup/modules/QrLib/kjua.js

@@ -2,10 +2,12 @@
  * Creates and modifies a QR code with the QR code library "kjua".
  *
  * @module QrLib/kjua
- * @requires /common/modules/Logger
+ * @requires QrError
  */
 /* globals kjua */
 
+import * as QrError from "./QrError.js";
+
 /**
  * The type of QR code this library generates.
  *
@@ -110,7 +112,13 @@ export function set(tag, value) {
  */
 export function getQr() {
  console.info("generated new qr kjua code", kjuaOptions);
- return kjua(kjuaOptions);
+
+ try {
+ return kjua(kjuaOptions);
+ } catch (err) {
+ throw err.message.startsWith("code length overflow.")
+ ? new QrError.DataOverflowError() : err;
+ }
 }
 
 /**

src/popup/modules/QrLib/qrgen.js

@@ -2,10 +2,11 @@
  * Creates and modifies a QR code with the QR code library "kjua".
  *
  * @module QrLib/qrgen
- * @requires /common/modules/Logger
+ * @requires QrError
  */
 /* globals qrcodegen */
 
+import * as QrError from "./QrError.js";
 const QRC = qrcodegen.QrCode;
 
 let qrQuietZone;
@@ -99,8 +100,12 @@ export function set(tag, value) {
 export function getQr() {
  console.info("generated new QrGen qr code");
 
- const qrElem = QRC.encodeText(qrText, qrErrorCorrection);
- const svgString = qrElem.toSvgString(qrQuietZone);
-
- return getSvgElement(svgString);
+ try {
+ const qrElem = QRC.encodeText(qrText, qrErrorCorrection);
+ const svgString = qrElem.toSvgString(qrQuietZone);
+ return getSvgElement(svgString);
+ } catch (err) {
+ throw (err === "Data too long")
+ ? new QrError.DataOverflowError() : err;
+ }
 }

src/popup/modules/UserInterface.js

@@ -5,9 +5,9 @@
  * @requires /common/modules/lodash/isObject
  * @requires /common/modules/lodash/throttle
  * @requires /common/modules/data/MessageLevel
- * @requires /common/modules/Logger
  * @requires /common/modules/AddonSettings
  * @requires /common/modules/MessageHandler
+ * @requires ./QrLib/QrErrors
  * @requires ./QrCreator
  */
 // lodash
@@ -19,6 +19,7 @@ import { COMMUNICATION_MESSAGE_TYPE } from "/common/modules/data/BrowserCommunic
 import * as AddonSettings from "/common/modules/AddonSettings/AddonSettings.js";
 import * as CommonMessages from "/common/modules/MessageHandler/CommonMessages.js";
 
+import * as QrError from "./QrLib/QrError.js";
 import * as QrCreator from "./QrCreator.js";
 import {createMenu} from "/common/modules/ContextMenu.js";
 
@@ -108,8 +109,18 @@ const refreshQrCode = throttle(() => {
  CommonMessages.hideError();
  }
 
- QrCreator.setTextInternal(text);
- QrCreator.generate();
+ try {
+ QrCreator.setTextInternal(text);
+ QrCreator.generate();
+ } catch (e) {
+ // Error thrown from qrcodegen & kjua wrapper when code too long
+ if (e instanceof QrError.DataOverflowError) {
+ CommonMessages.showError("errorQrCodeOverflow");
+ console.error("Maximum size of QR code data exceeded with", text.length, "characters.");
+ } else {
+ throw e;
+ }
+ }
 }, QR_CODE_REFRESH_TIMEOUT);
 
 /**

src/popup/qrcode.html

@@ -6,7 +6,7 @@
  <link rel="stylesheet" href="../common/common.css">
  <link rel="stylesheet" href="qrcode.css">
 
- <script src="lib/kjua.min.js" charset="utf-8"></script>
+ <script src="lib/kjua-0.2.0.min.js" charset="utf-8"></script>
  <script src="lib/qrcodegen.js" charset="utf-8"></script>
 
  <script type="module" src="/common/modules/Logger/OverwriteConsoleLog.js" async></script>