@byted/qrcode-generator - npm Package Compare versions

Comparing version 1.0.5 to 1.0.6

lib/index.js

@@ -7,146 +7,147 @@ var qrcode = require("qrcode");
     module.exports = null;
-} else {
-    //维护全局Blob对象实例
-    qrcode.blobInstance = {};
+    return;
+}
 
-    //维护全局Canvas对象实例
-    qrcode.canvasInstance = {};
-    
-    /** 渲染生成二维码及对应Blob对象
-     * @param id Canvas画布id
-     * @param text 二维码展示内容
-     * @param option 二维码渲染配置对象（完整支持https://www.npmjs.com/package/qrcode）
-     * @return new Promise
-     */
-    qrcode.render = (id, text, option) => {
-        return new Promise((resolve, reject) => {
-            var cus_id = "";
-    
-            if(id) {
-                cus_id = id;
-                if(!Util.domValidate(cus_id).status) {
-                    reject(qrcode);
-                    return;
-                } else {
-                    qrcode.canvasInstance[cus_id] = Util.domValidate(cus_id).result;
-                }
-            } else {
-                //调用时未传入id，主动创建canvas元素
-                cus_id = (new Date()).getTime() + "";
-                qrcode.canvasInstance[cus_id] = document.createElement("canvas");
-                qrcode.canvasInstance[cus_id].setAttribute("id", "byted-qrcode-generator_" + cus_id);
-                document.body.appendChild(qrcode.canvasInstance[cus_id]);
-            }
-        
-            qrcode.toDataURL(qrcode.canvasInstance[cus_id], text, option, function (error) {
-                if (error) {
-                    console.error("[byted-qrcode-generator] " + error);
-                    reject(error);
-                } else {
-                    let imageSrc = qrcode.canvasInstance[cus_id].toDataURL("image/png").replace("image/png", "image/octet-stream");
-                    qrcode.blobInstance[cus_id] = Util.convertBase64UrlToBlob(imageSrc);
-                    resolve(qrcode);
-                }
-            })
-        })
-    }
-    
-    /** 上传二维码图片
-     * @param id Canvas画布id
-     * @param url 二维码上传地址（非跨域）
-     * @return new Promise
-     */
-    qrcode.upload = (id, url) => {
-        return new Promise((resolve, reject) => {
-            if(!qrcode.blobInstance[id]) {
-                console.error(`[byted-qrcode-generator] upload Error. the blobInstance  named '${id}' does not exist, please render QRCode first.`);
+//维护全局Blob对象实例
+qrcode.blobInstance = {};
+
+//维护全局Canvas对象实例
+qrcode.canvasInstance = {};
+
+/** 渲染生成二维码及对应Blob对象
+ * @param id Canvas画布id
+ * @param text 二维码展示内容
+ * @param option 二维码渲染配置对象（完整支持https://www.npmjs.com/package/qrcode）
+ * @return new Promise((resolve, reject) => {resolve(qrcodeInstance), reject(error)})
+ */
+qrcode.render = (id, text, option) => {
+    return new Promise((resolve, reject) => {
+        var cus_id = "";
+
+        if(id) {
+            cus_id = id;
+            if(!Util.domValidate(cus_id).status) {
                 reject(qrcode);
-            } else if(!url) {
-                console.error(`[byted-qrcode-generator] upload Error. please specify the upload URL.`);
-                reject(qrcode);
+                return;
             } else {
-                let formData = new FormData();
-                formData.append("file", qrcode.blobInstance[id]);
-        
-                axios({
-                    method: 'post',
-                    url: url,
-                    data: formData,
-                    headers: {'Content-Type': 'multipart/form-data'}
-                })
-                .then((res) => {
-                    if (res.status == 200) {
-                        let result = res.data.status_code;
-                        if (result == 0) {
-                            resolve(qrcode);
-                        } else {
-                            console.error("[byted-qrcode-generator] qrcode upload failed.")
-                            reject(qrcode);
-                        }
-                    }
-                })
-                .catch((err) => {
-                    console.error("[byted-qrcode-generator] qrcode upload failed. " + err);
-                    reject(qrcode);
-                });
+                qrcode.canvasInstance[cus_id] = Util.domValidate(cus_id).result;
             }
-        })
-    }
+        } else {
+            //调用时未传入id，主动创建canvas元素
+            cus_id = (new Date()).getTime() + "";
+            qrcode.canvasInstance[cus_id] = document.createElement("canvas");
+            qrcode.canvasInstance[cus_id].setAttribute("id", "byted-qrcode-generator_" + cus_id);
+            document.body.appendChild(qrcode.canvasInstance[cus_id]);
+        }
     
-    /** 导出二维码图片
-     * @param id Canvas画布id
-     * @param filename 二维码文件名
-     * @return new Promise
-     */
-    qrcode.exportImage = (id, filename) => {
-        return new Promise((resolve, reject) => {
-            if(!qrcode.canvasInstance[id]) {
-                console.error(`[byted-qrcode-generator] exportImage Error. the canvasInstance named '${id}' does not exist, please render QRCode first.`);
-                reject(qrcode);
+        qrcode.toDataURL(qrcode.canvasInstance[cus_id], text, option, function (error) {
+            if (error) {
+                console.error("[byted-qrcode-generator] " + error);
+                reject(error);
             } else {
-                var link = document.createElement("a");
-                link.href = qrcode.canvasInstance[id].toDataURL("image/png");
-                link.download = (filename || "byted-qrcode-generator") + "_" + (new Date()).getTime();
-                link.click();
+                let imageSrc = qrcode.canvasInstance[cus_id].toDataURL("image/png").replace("image/png", "image/octet-stream");
+                qrcode.blobInstance[cus_id] = Util.convertBase64UrlToBlob(imageSrc);
                 resolve(qrcode);
             }
         })
-    }
+    })
+}
 
-    /** 获取二维码Blob对象实例
-     * @param id Canvas画布id
-     * @return blobInstance or {}
-     */
-    qrcode.getBlobInstance = (id) => {
-        return qrcode.blobInstance[id] || {};
-    }
+/** 上传二维码图片
+ * @param id Canvas画布id
+ * @param url 二维码上传地址（非跨域）
+ * @return new Promise((resolve, reject) => {resolve(responce), reject(qrcodeInstance)})
+ */
+qrcode.upload = (id, url) => {
+    return new Promise((resolve, reject) => {
+        if(!qrcode.blobInstance[id]) {
+            console.error(`[byted-qrcode-generator] upload Error. the blobInstance  named '${id}' does not exist, please render QRCode first.`);
+            reject(qrcode);
+        } else if(!url) {
+            console.error(`[byted-qrcode-generator] upload Error. please specify the upload URL.`);
+            reject(qrcode);
+        } else {
+            let formData = new FormData();
+            formData.append("file", qrcode.blobInstance[id]);
     
-    /** 获取二维码Canvas对象实例
-     * @param id Canvas画布id
-     * @return canvasInstance or {}
-     */
-    qrcode.getCanvasInstance = (id) => {
-        return qrcode.canvasInstance[id] || {};
-    }
+            axios({
+                method: 'post',
+                url: url,
+                data: formData,
+                headers: {'Content-Type': 'multipart/form-data'}
+            })
+            .then((res) => {
+                if (res.status == 200) {
+                    let result = res.data.status_code;
+                    if (result == 0) {
+                        resolve(res);
+                    } else {
+                        console.error("[byted-qrcode-generator] qrcode upload failed.")
+                        reject(qrcode);
+                    }
+                }
+            })
+            .catch((err) => {
+                console.error("[byted-qrcode-generator] qrcode upload failed. " + err);
+                reject(qrcode);
+            });
+        }
+    })
+}
 
-    /** 销毁二维码实例并清空画布
-     * @param id Canvas画布id
-     * @returns
-     */
-    qrcode.destroy = (id) => {
-        qrcode.canvasInstance[id] = null;
-        qrcode.blobInstance[id] = null;
-
-        var canvas = document.getElementById(id);
-        if(!canvas || canvas.nodeName.toLowerCase() !== "canvas") {
-            console.error("[byted-qrcode-generator] the qrcode instance you want to destroy does not exist, qrcode.destroy() has been cancelled.");
+/** 导出二维码图片
+ * @param id Canvas画布id
+ * @param filename 二维码文件名
+ * @return new Promise((resolve, reject) => {resolve(qrcodeInstance), reject(qrcodeInstance)})
+ */
+qrcode.exportImage = (id, filename) => {
+    return new Promise((resolve, reject) => {
+        if(!qrcode.canvasInstance[id]) {
+            console.error(`[byted-qrcode-generator] exportImage Error. the canvasInstance named '${id}' does not exist, please render QRCode first.`);
+            reject(qrcode);
         } else {
-            var ctx = canvas.getContext("2d");
-            ctx.setTransform(1, 0, 0, 1, 0, 0);
-            ctx.clearRect(0, 0, canvas.width, canvas.height);
+            var link = document.createElement("a");
+            link.href = qrcode.canvasInstance[id].toDataURL("image/png");
+            link.download = (filename || "byted-qrcode-generator") + "_" + (new Date()).getTime();
+            link.click();
+            resolve(qrcode);
         }
-    }
+    })
+}
 
-    module.exports = qrcode;
+/** 获取二维码Blob对象实例
+ * @param id Canvas画布id
+ * @return blobInstance or {}
+ */
+qrcode.getBlobInstance = (id) => {
+    return qrcode.blobInstance[id] || {};
 }
 
+/** 获取二维码Canvas对象实例
+ * @param id Canvas画布id
+ * @return canvasInstance or {}
+ */
+qrcode.getCanvasInstance = (id) => {
+    return qrcode.canvasInstance[id] || {};
+}
+
+/** 销毁二维码实例并清空画布
+ * @param id Canvas画布id
+ * @returns
+ */
+qrcode.destroy = (id) => {
+    qrcode.canvasInstance[id] = null;
+    qrcode.blobInstance[id] = null;
+
+    var canvas = document.getElementById(id);
+    if(!canvas || canvas.nodeName.toLowerCase() !== "canvas") {
+        console.error("[byted-qrcode-generator] the qrcode instance you want to destroy does not exist, qrcode.destroy() has been cancelled.");
+    } else {
+        var ctx = canvas.getContext("2d");
+        ctx.setTransform(1, 0, 0, 1, 0, 0);
+        ctx.clearRect(0, 0, canvas.width, canvas.height);
+    }
+}
+
+module.exports = qrcode;
+

package.json

 {
   "name": "@byted/qrcode-generator",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "description": "A tool for generating qrcode. Support to render canvas, display image, download image file and execute callback, upload image file and execute callback, add customized picture to the center of the qrcode and etc.",
@@ -5,0 +5,0 @@ "main": "index.js",

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Worsened metrics

Total package byte prevSize

9741

decreased by-4.04%

Number of package files

5

decreased by-16.67%

No dependency changes