@xpadev-net/niconicomments 0.2.8 → 0.2.9

package/README.md

@@ -1,7 +1,7 @@
 # [niconicomments](https://xpadev.net/niconicomments/)
 [![GitHub license](https://img.shields.io/badge/license-MIT-blue.svg)](https://github.com/xpadev-net/niconicomments/blob/master/LICENSE)  
-ニコニコ動画の公式プレイヤーに多少の互換性を持つコメント描画ライブラリです  
-This is a comment drawing library that is somewhat compatible with the official Nico Nico Douga player.  
+ニコニコ動画の公式プレイヤー互換の高パフォーマンスなコメント描画ライブラリ   
+High peformance High compatibility comment drawing library  
 Reference： https://xpadev-net.github.io/niconicomments/  
 Github： https://github.com/xpadev-net/niconicomments  
 npm： https://www.npmjs.com/package/@xpadev-net/niconicomments  
@@ -27,6 +27,5 @@ setInterval(() => niconiComments.drawCanvas(Math.floor(video.currentTime * 100))
 ```
 
 ## Sample
-[レッツゴー！陰陽師](https://xpadev.net/niconicomments/sample.html)  
-[レッツゴー！陰陽師(CodePen)](https://codepen.io/xpadev-net/pen/mdBdQmX)  
-[ニコニコ動画流星群](https://xpadev.net/niconicomments/ryuuseigun.html)  
+[サンプル](https://xpadev.net/niconicomments/sample.html)  
+[CodePen](https://codepen.io/xpadev-net/pen/mdBdQmX)  

package/dist/bundle.js

@@ -1,5 +1,5 @@
 /*!
-  niconicomments.js v0.2.8
+  niconicomments.js v0.2.9
   (c) 2021 xpadev-net https://xpadev.net
   Released under the MIT License.
 */
@@ -9,32 +9,20 @@
     (global = typeof globalThis !== 'undefined' ? globalThis : global || self, global.NiconiComments = factory());
 })(this, (function () { 'use strict';
 
-    /*! *****************************************************************************
-    Copyright (c) Microsoft Corporation.
-
-    Permission to use, copy, modify, and/or distribute this software for any
-    purpose with or without fee is hereby granted.
-
-    THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
-    REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-    AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
-    INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-    LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-    OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-    PERFORMANCE OF THIS SOFTWARE.
-    ***************************************************************************** */
-    var __assign = function () {
-      __assign = Object.assign || function __assign(t) {
+    var _assign = function __assign() {
+      _assign = Object.assign || function __assign(t) {
         for (var s, i = 1, n = arguments.length; i < n; i++) {
           s = arguments[i];
 
-          for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
+          for (var p in s) {
+            if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
+          }
         }
 
         return t;
       };
 
-      return __assign.apply(this, arguments);
+      return _assign.apply(this, arguments);
     };
 
     var NiconiComments = (function () {
@@ -50,7 +38,10 @@
             }; }
             var _this = this;
             this.canvas = canvas;
-            this.context = canvas.getContext("2d");
+            var context = canvas.getContext("2d");
+            if (!context)
+                throw new Error("Fail to get CanvasRenderingContext2D");
+            this.context = context;
             this.context.strokeStyle = "rgba(0,0,0,0.7)";
             this.context.textAlign = "start";
             this.context.textBaseline = "alphabetic";
@@ -68,17 +59,17 @@
                 },
                 "big": {
                     "default": 111,
-                    "resized": 62
+                    "resized": 61
                 }
             };
             this.doubleResizeMaxWidth = {
                 full: {
                     legacy: 3020,
-                    "default": 3220
+                    default: 3220
                 },
                 normal: {
                     legacy: 2540,
-                    "default": 2740
+                    default: 2740
                 }
             };
             var parsedData = options.formatted ? data : this.parseData(data);
@@ -87,17 +78,18 @@
             this.showFPS = options.showFPS;
             this.showCommentCount = options.showCommentCount;
             this.timeline = {};
-            this.nicoScripts = { reverse: [], "default": [], replace: [], ban: [] };
+            this.nicoScripts = { reverse: [], default: [], replace: [], ban: [] };
             this.collision_right = {};
             this.collision_left = {};
             this.collision_ue = {};
             this.collision_shita = {};
+            this.data = [];
             this.lastVpos = -1;
             this.useLegacy = options.useLegacy;
             this.preRendering(parsedData, options.drawAllImageOnLoad);
             this.fpsCount = 0;
             this.fps = 0;
-            this.fpsClock = window.setInterval(function () {
+            window.setInterval(function () {
                 _this.fps = _this.fpsCount * 2;
                 _this.fpsCount = 0;
             }, 500);
@@ -106,8 +98,11 @@
             var data_ = [];
             for (var i = 0; i < data.length; i++) {
                 for (var key in data[i]) {
-                    var value = data[i][key];
-                    if (key === "chat" && value["deleted"] !== 1) {
+                    var val = data[i];
+                    if (!val)
+                        continue;
+                    var value = val[key];
+                    if (isApiChat(value) && value["deleted"] !== 1) {
                         var tmpParam = {
                             "id": value["no"],
                             "vpos": value["vpos"],
@@ -157,8 +152,11 @@
         NiconiComments.prototype.getFont = function (parsedData) {
             var result = [];
             for (var i in parsedData) {
-                parsedData[i].content = parsedData[i].content.replace(/\t/g, "\u2003\u2003");
-                result[i] = this.parseCommandAndNicoscript(parsedData[i]);
+                var value = parsedData[i];
+                if (!value)
+                    continue;
+                value.content = value.content.replace(/\t/g, "\u2003\u2003");
+                result[i] = this.parseCommandAndNicoscript(value);
             }
             return result;
         };
@@ -174,15 +172,16 @@
                             continue;
                         }
                         var measure = this.measureText(comment);
-                        result[comment.index] = parsedData[comment.index];
-                        result[comment.index].height = measure.height;
-                        result[comment.index].width = measure.width;
-                        result[comment.index].width_max = measure.width_max;
-                        result[comment.index].width_min = measure.width_min;
+                        var size = parsedData[comment.index];
+                        size.height = measure.height;
+                        size.width = measure.width;
+                        size.width_max = measure.width_max;
+                        size.width_min = measure.width_min;
                         if (measure.resized) {
-                            result[comment.index].fontSize = measure.fontSize;
+                            size.fontSize = measure.fontSize;
                             this.context.font = parseFont(i, j, this.useLegacy);
                         }
+                        result[comment.index] = size;
                     }
                 }
             }
@@ -192,7 +191,7 @@
             var data = parsedData;
             for (var i in data) {
                 var comment = data[i];
-                if (comment.invisible) {
+                if (!comment || comment.invisible) {
                     continue;
                 }
                 for (var j = 0; j < 500; j++) {
@@ -250,7 +249,7 @@
                                         break;
                                     }
                                 }
-                                if (left_pos <= 40 && is_break === false) {
+                                if (left_pos <= 40 && !is_break) {
                                     for (var k in this.collision_left[vpos]) {
                                         var l = this.collision_left[vpos][k];
                                         if ((posY < data[l].posY + data[l].height && posY + comment.height > data[l].posY) && data[l].owner === comment.owner) {
@@ -347,6 +346,8 @@
         };
         NiconiComments.prototype.sortComment = function (parsedData) {
             for (var vpos in this.timeline) {
+                if (!this.timeline[vpos])
+                    continue;
                 this.timeline[vpos].sort(function (a, b) {
                     var A = parsedData[a];
                     var B = parsedData[b];
@@ -409,11 +410,12 @@
                     return this.measureText(comment);
                 }
             }
-            else if (comment.loc !== "naka" && comment.tateresized && (comment.full && width_max > 1920 || !comment.full && width_max > 1440) && !comment.yokoResized) {
-                comment.fontSize = this.fontSize[comment.size]["default"];
+            else if (comment.loc !== "naka" && comment.tateresized && (comment.full && width_max > 2120 || !comment.full && width_max > 1440) && !comment.yokoResized) {
+                comment.fontSize = this.fontSize[comment.size].default;
                 comment.resized = true;
                 comment.yokoResized = true;
                 this.context.font = parseFont(comment.font, comment.fontSize, this.useLegacy);
+                console.log(comment);
                 return this.measureText(comment);
             }
             else if (comment.loc !== "naka" && comment.tateresized && comment.yokoResized) {
@@ -466,17 +468,20 @@
             else if (comment.loc === "shita") {
                 posY = 1080 - comment.posY - comment.height;
             }
-            this.context.drawImage(comment.image, posX, posY);
+            if (comment.image)
+                this.context.drawImage(comment.image, posX, posY);
         };
         NiconiComments.prototype.getTextImage = function (i) {
             var value = this.data[i];
-            if (value.invisible) {
+            if (!value || value.invisible) {
                 return;
             }
             var image = document.createElement("canvas");
             image.width = value.width_max;
             image.height = value.height;
             var context = image.getContext("2d");
+            if (!context)
+                throw new Error("Fail to get CanvasRenderingContext2D");
             context.strokeStyle = "rgba(0,0,0,0.7)";
             context.textAlign = "start";
             context.textBaseline = "alphabetic";
@@ -543,11 +548,11 @@
                     switch (command) {
                         case "big":
                             size = "big";
-                            fontSize = this.fontSize.big["default"];
+                            fontSize = this.fontSize.big.default;
                             break;
                         case "small":
                             size = "small";
-                            fontSize = this.fontSize.small["default"];
+                            fontSize = this.fontSize.small.default;
                             break;
                     }
                 }
@@ -660,7 +665,7 @@
             if (nicoscript) {
                 switch (nicoscript[1]) {
                     case "デフォルト":
-                        this.nicoScripts["default"].push({
+                        this.nicoScripts.default.push({
                             start: comment.vpos,
                             long: data.long === null ? null : Math.floor(data.long * 100),
                             color: data.color,
@@ -671,6 +676,8 @@
                         break;
                     case "逆":
                         var reverse = comment.content.match(/^@逆 ?(全|コメ|投コメ)?/);
+                        if (!reverse)
+                            reverse = [];
                         if (!reverse[1]) {
                             reverse[1] = "全";
                         }
@@ -689,7 +696,7 @@
                         }
                         this.nicoScripts.reverse.push({
                             start: comment.vpos,
-                            end: comment.vpos + (data.long * 100)
+                            end: comment.vpos + (data.long * 100),
                         });
                         break;
                     case "置換":
@@ -739,27 +746,27 @@
                 data.invisible = true;
             }
             var color = "#FFFFFF", size = "medium", font = "defont", loc = "naka";
-            for (var i in this.nicoScripts["default"]) {
-                if (this.nicoScripts["default"][i].long !== null && this.nicoScripts["default"][i].start + this.nicoScripts["default"][i].long < comment.vpos) {
-                    this.nicoScripts["default"] = this.nicoScripts["default"].splice(Number(i), 1);
+            for (var i in this.nicoScripts.default) {
+                if (this.nicoScripts.default[i].long !== null && this.nicoScripts.default[i].start + this.nicoScripts.default[i].long < comment.vpos) {
+                    this.nicoScripts.default = this.nicoScripts.default.splice(Number(i), 1);
                     continue;
                 }
-                if (this.nicoScripts["default"][i].loc) {
-                    loc = this.nicoScripts["default"][i].loc;
+                if (this.nicoScripts.default[i].loc) {
+                    loc = this.nicoScripts.default[i].loc;
                 }
-                if (this.nicoScripts["default"][i].color) {
-                    color = this.nicoScripts["default"][i].color;
+                if (this.nicoScripts.default[i].color) {
+                    color = this.nicoScripts.default[i].color;
                 }
-                if (this.nicoScripts["default"][i].size) {
-                    size = this.nicoScripts["default"][i].size;
+                if (this.nicoScripts.default[i].size) {
+                    size = this.nicoScripts.default[i].size;
                 }
-                if (this.nicoScripts["default"][i].font) {
-                    font = this.nicoScripts["default"][i].font;
+                if (this.nicoScripts.default[i].font) {
+                    font = this.nicoScripts.default[i].font;
                 }
             }
             for (var i in this.nicoScripts.replace) {
                 if (this.nicoScripts.replace[i].long !== null && this.nicoScripts.replace[i].start + this.nicoScripts.replace[i].long < comment.vpos) {
-                    this.nicoScripts["default"] = this.nicoScripts["default"].splice(Number(i), 1);
+                    this.nicoScripts.default = this.nicoScripts.default.splice(Number(i), 1);
                     continue;
                 }
                 var item = this.nicoScripts.replace[i];
@@ -794,7 +801,7 @@
             }
             if (!data.size) {
                 data.size = size;
-                data.fontSize = this.fontSize[data.size]["default"];
+                data.fontSize = this.fontSize[data.size].default;
             }
             if (!data.font) {
                 data.font = font;
@@ -807,7 +814,7 @@
                     data.long = Math.floor(data.long * 100);
                 }
             }
-            return __assign(__assign({}, comment), data);
+            return _assign(_assign({}, comment), data);
         };
         NiconiComments.prototype.drawCanvas = function (vpos) {
             if (this.lastVpos === vpos)
@@ -828,13 +835,14 @@
                 this.context.drawImage(this.video, offsetX, offsetY, this.video.videoWidth * scale, this.video.videoHeight * scale);
             }
             if (this.timeline[vpos]) {
-                for (var index in this.timeline[vpos]) {
-                    var comment = this.data[this.timeline[vpos][index]];
-                    if (comment.invisible) {
+                for (var i in this.timeline[vpos]) {
+                    var index = this.timeline[vpos][Number(i)];
+                    var comment = this.data[index];
+                    if (!comment || comment.invisible) {
                         continue;
                     }
                     if (!comment.image) {
-                        this.getTextImage(this.timeline[vpos][index]);
+                        this.getTextImage(index);
                     }
                     this.drawText(comment, vpos);
                 }
@@ -918,6 +926,9 @@
         }
         return string;
     };
+    var isApiChat = function (item) {
+        return !!item.chat;
+    };
 
     return NiconiComments;
 

package/package.json

@@ -1,14 +1,16 @@
 {
   "name": "@xpadev-net/niconicomments",
-  "version": "0.2.8",
+  "version": "0.2.9",
   "description": "NiconiComments is a comment drawing library that is somewhat compatible with the official Nico Nico Douga player.",
   "main": "dist/bundle.js",
+  "types": "dist/dts/main.d.ts",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
     "build": "rollup -c rollup.config.js",
     "watch": "rollup -c rollup.config.js -w",
     "typedoc": "typedoc --options tsdoc.json --out ./docs/type/ ./src/main.ts",
-    "prepublishOnly": "npm run build"
+    "tsc": "tsc --emitDeclarationOnly",
+    "prepublishOnly": "npm run tsc&&npm run build&&npm run typedoc"
   },
   "repository": {
     "type": "git",
@@ -28,10 +30,11 @@
   "license": "MIT",
   "devDependencies": {
     "@rollup/plugin-babel": "^5.3.0",
-    "@rollup/plugin-typescript": "^8.3.1",
-    "rollup": "~2.66",
-    "typedoc": "^0.22.13",
+    "@rollup/plugin-typescript": "^8.3.2",
+    "rollup": "^2.75.6",
+    "typedoc": "^0.22.17",
     "typedoc-plugin-missing-exports": "^0.22.6",
-    "typescript": "^4.6.3"
+    "typescript": "^4.7.3",
+    "@babel/preset-env": "^7.18.2"
   }
 }