@xpadev-net/niconicomments 0.2.33 → 0.2.34

package/README.en.md

@@ -0,0 +1,41 @@
+# [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)
+
+[[日本語](https://github.com/xpadev-net/niconicomments/blob/develop/README.md)]
+
+Comment rendering library that is somewhat compatible with the official Nico Nico Douga player  
+Reference： https://xpadev-net.github.io/niconicomments/  
+Github： https://github.com/xpadev-net/niconicomments  
+npm： https://www.npmjs.com/package/@xpadev-net/niconicomments
+
+## For users who use this library for domestic use in Japan
+This library may infringe on Dwango's patents depending on how it is used  
+Please carefully review the following applicable patents and case law before using this library with caution.  
+[JP,2006-333851](https://www.j-platpat.inpit.go.jp/c1800/PU/JP-2006-333851/7294651F33633E1EBF3DEC66FAE0ECAD878D19E1829C378FC81D26BBD0A4263B/10/en)  
+[JP,2010-267283](https://www.j-platpat.inpit.go.jp/c1800/PU/JP-4734471/9085C128B7ED7D57F6C2F09D9BE4FCB496E638331DB9EC7ADE1E3A44999A3878/15/en)  
+[JP,2018-202475](https://www.j-platpat.inpit.go.jp/c1800/PU/JP-6526304/D8AF77CFB92D96C785FEECBD690C53E2F9023F1739E7A5BBDAB588E2ECAC5316/15/en)  
+[2018: Case No. Heisei 28 (wa) 38565, Patent Infringement Injunction, etc. Patent Right Civil Litigation](https://www.courts.go.jp/app/files/hanrei_jp/073/088073_hanrei.pdf)  
+[2022: Heisei 30 (ne) 10077 Appeal for Patent Infringement Injunction, etc. Patent Right Civil Litigation](https://www.courts.go.jp/app/files/hanrei_jp/418/091418_hanrei.pdf)  
+
+## Installation
+```html
+<script src="https://cdn.jsdelivr.net/npm/@xpadev-net/niconicomments@latest/dist/bundle.min.js"></script>
+```
+or
+```
+npm i @xpadev-net/niconicomments
+```
+
+## Examples
+```javascript
+const canvas = document.getElementById("canvas");
+const video = document.getElementById("video");
+const req = await fetch("sample.json");
+const res = await req.json();
+const niconiComments = new NiconiComments(canvas, res);
+//If video.ontimeupdate is used, the comments will be choppy due to the small number of calls.
+setInterval(() => niconiComments.drawCanvas(Math.floor(video.currentTime * 100)), 10);
+```
+
+## Sample
+[Sample](https://xpadev-net.github.io/niconicomments/sample/)  

package/README.md

@@ -1,21 +1,21 @@
 # [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)
 
-[日本語](https://github.com/xpadev-net/niconicomments/blob/develop/README.ja.md)
+[[English](https://github.com/xpadev-net/niconicomments/blob/develop/README.en.md)]
 
-Comment rendering 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
 
-## For users who use this library for domestic use in Japan
-This library may infringe on Dwango's patents depending on how it is used  
-Please carefully review the following applicable patents and case law before using this library with caution.  
-[JP,2006-333851](https://www.j-platpat.inpit.go.jp/c1800/PU/JP-2006-333851/7294651F33633E1EBF3DEC66FAE0ECAD878D19E1829C378FC81D26BBD0A4263B/10/en)  
-[JP,2010-267283](https://www.j-platpat.inpit.go.jp/c1800/PU/JP-4734471/9085C128B7ED7D57F6C2F09D9BE4FCB496E638331DB9EC7ADE1E3A44999A3878/15/en)  
-[JP,2018-202475](https://www.j-platpat.inpit.go.jp/c1800/PU/JP-6526304/D8AF77CFB92D96C785FEECBD690C53E2F9023F1739E7A5BBDAB588E2ECAC5316/15/en)  
-[2018: Case No. Heisei 28 (wa) 38565, Patent Infringement Injunction, etc. Patent Right Civil Litigation](https://www.courts.go.jp/app/files/hanrei_jp/073/088073_hanrei.pdf)  
-[2022: Heisei 30 (ne) 10077 Appeal for Patent Infringement Injunction, etc. Patent Right Civil Litigation](https://www.courts.go.jp/app/files/hanrei_jp/418/091418_hanrei.pdf)  
+## [重要]このライブラリを使用される方へ
+ニコニコ運営が画面にコメントを流すアドオンを特許侵害だと騒ぎ立てて潰して回っているようです  
+このライブラリ本体は描画部分のみのため特許侵害に当たるとは考えていませんが、ニコニコ動画運営(とその近辺の人)に叩かれる可能性があります  
+(名前は出しませんがすでにいくつかのOSSに被害が出ています)  
+また、このライブラリを使用するかどうかに関わらず、リアルタイムでコメントを取得、画面を描画、コメントの投稿という一連の流れを実装した場合、ニコニコの特許を侵害する可能性があります  
+詳しくはこちら[ニコニコが保有する特許について](https://github.com/xpadev-net/niconicomments/blob/develop/ABOUT_PATENT.md)を参照してください  
+**※当ライブラリを削除する予定は一切ありません**
 
 ## Installation
 ```html
@@ -33,9 +33,9 @@ const video = document.getElementById("video");
 const req = await fetch("sample.json");
 const res = await req.json();
 const niconiComments = new NiconiComments(canvas, res);
-//If video.ontimeupdate is used, the comments will be choppy due to the small number of calls.
+//video.ontimeupdateを使用すると、呼び出し回数の関係でコメントカクつく
 setInterval(() => niconiComments.drawCanvas(Math.floor(video.currentTime * 100)), 10);
 ```
 
 ## Sample
-[Sample](https://xpadev-net.github.io/niconicomments/sample/)  
+[サンプル](https://xpadev-net.github.io/niconicomments/sample/)  

package/dist/bundle.d.ts

@@ -61,11 +61,6 @@ declare let imageCache: {
 declare const resetImageCache: () => void;
 
 
-declare let canvas: HTMLCanvasElement;
-declare let context: CanvasRenderingContext2D;
-declare const initCanvas: () => void;
-
-
 declare let nicoScripts: nicoScript;
 declare const resetNicoScripts: () => void;
 
@@ -610,7 +605,7 @@ declare class NiconiComments {
 
 declare const getLineHeight: (fontSize: commentSize, isFlash: boolean, resized?: boolean) => number;
 declare const getCharSize: (fontSize: commentSize, isFlash: boolean) => number;
-declare const measure: (comment: measureInput) => {
+declare const measure: (comment: measureInput, context: CanvasRenderingContext2D) => {
     height: number;
     width: number;
     lineWidth: number[];

package/dist/bundle.js

@@ -1,5 +1,5 @@
 /*!
-  niconicomments.js v0.2.33
+  niconicomments.js v0.2.34
   (c) 2021 xpadev-net https://xpadev.net
   Released under the MIT License.
 */
@@ -1330,18 +1330,6 @@
         return result;
     };
 
-    var canvas;
-    var context;
-    var initCanvas = function () {
-        canvas = document.createElement("canvas");
-        var _context = canvas.getContext("2d");
-        if (_context === null)
-            throw new Error("fail to get Context2D");
-        context = _context;
-        context.textAlign = "start";
-        context.textBaseline = "alphabetic";
-    };
-
     var getLineHeight = function (fontSize, isFlash, resized) {
         if (resized === void 0) { resized = false; }
         var lineCounts = getConfig(config.lineCounts, isFlash), commentStageSize = getConfig(config.commentStageSize, isFlash), lineHeight = commentStageSize.height / lineCounts.doubleResized[fontSize], defaultLineCount = lineCounts.default[fontSize];
@@ -1357,11 +1345,11 @@
         var lineCounts = getConfig(config.lineCounts, isFlash), commentStageSize = getConfig(config.commentStageSize, isFlash);
         return commentStageSize.height / lineCounts.doubleResized[fontSize];
     };
-    var measure = function (comment) {
-        var width = measureWidth(comment);
+    var measure = function (comment, context) {
+        var width = measureWidth(comment, context);
         return _assign(_assign({}, width), { height: comment.lineHeight * (comment.lineCount - 1) + comment.charSize });
     };
-    var measureWidth = function (comment) {
+    var measureWidth = function (comment, context) {
         var _a = getFontSizeAndScale(comment.charSize), fontSize = _a.fontSize, scale = _a.scale, lineWidth = [], itemWidth = [];
         context.font = parseFont(comment.font, fontSize);
         var currentWidth = 0;
@@ -1528,13 +1516,13 @@
                 comment.lineHeight = lineHeight_1;
                 comment.resized = true;
                 comment.resizedY = true;
-                var measureResult = measure(comment);
+                var measureResult = measure(comment, this.context);
                 height = measureResult.height;
                 width = measureResult.width;
                 itemWidth = measureResult.itemWidth;
             }
             else {
-                var measureResult = measure(comment);
+                var measureResult = measure(comment, this.context);
                 height = measureResult.height;
                 width = measureResult.width;
                 itemWidth = measureResult.itemWidth;
@@ -1546,14 +1534,14 @@
                 _comment.charSize = (_comment.charSize || 0) * scale_1;
                 _comment.lineHeight = (_comment.lineHeight || 0) * scale_1;
                 _comment.fontSize = _comment.charSize * 0.8;
-                var result = measure(_comment);
+                var result = measure(_comment, this.context);
                 if (result.width > widthLimit) {
                     while (result.width >= widthLimit) {
                         var originalCharSize = _comment.charSize;
                         _comment.charSize -= 1;
                         _comment.lineHeight *= _comment.charSize / originalCharSize;
                         _comment.fontSize = _comment.charSize * 0.8;
-                        result = measure(_comment);
+                        result = measure(_comment, this.context);
                     }
                 }
                 else {
@@ -1564,7 +1552,7 @@
                         _comment.charSize += 1;
                         _comment.lineHeight *= _comment.charSize / originalCharSize;
                         _comment.fontSize = _comment.charSize * 0.8;
-                        result = measure(_comment);
+                        result = measure(_comment, this.context);
                     }
                     _comment = lastComment;
                 }
@@ -1578,7 +1566,7 @@
                     comment.lineHeight = _comment.lineHeight;
                 }
                 comment.fontSize = (comment.charSize || 0) * 0.8;
-                result = measure(comment);
+                result = measure(comment, this.context);
                 width = result.width;
                 height = result.height;
                 itemWidth = result.itemWidth;
@@ -1715,14 +1703,13 @@
                 "@@HTML5@@" +
                 __spreadArray([], this.comment.mail, true).sort().join(","), cache = imageCache[cacheKey];
             if (cache) {
+                this.image = cache.image;
+                window.setTimeout(function () {
+                    delete _this.image;
+                }, this.comment.long * 10 + config.cacheAge);
                 clearTimeout(cache.timeout);
                 cache.timeout = window.setTimeout(function () {
-                    if (_this.image) {
-                        delete _this.image;
-                    }
-                    if (cache) {
-                        delete imageCache[cacheKey];
-                    }
+                    delete imageCache[cacheKey];
                 }, this.comment.long * 10 + config.cacheAge);
                 return cache.image;
             }
@@ -1777,14 +1764,12 @@
                 }
             }
             this.image = image;
+            window.setTimeout(function () {
+                delete _this.image;
+            }, this.comment.long * 10 + config.cacheAge);
             imageCache[cacheKey] = {
                 timeout: window.setTimeout(function () {
-                    if (cache) {
-                        delete imageCache[cacheKey];
-                    }
-                    if (_this.image) {
-                        delete _this.image;
-                    }
+                    delete imageCache[cacheKey];
                 }, this.comment.long * 10 + config.cacheAge),
                 image: image,
             };
@@ -2131,8 +2116,6 @@
             var height = (comment.fontSize * comment.lineHeight * lineCount +
                 config.commentYPaddingTop[comment.resizedY ? "resized" : "default"]) *
                 this.scale;
-            if (Number.isNaN(height))
-                console.log(comment, lineCount, this.scale);
             if (comment.loc !== "naka") {
                 var widthLimit = getConfig(config.commentStageSize, true)[comment.full ? "fullWidth" : "width"];
                 if (width_max > widthLimit && !comment.resizedX) {
@@ -2231,12 +2214,7 @@
                 else {
                     this.context.globalAlpha = 1;
                 }
-                try {
-                    this.context.drawImage(this.image, posX, posY);
-                }
-                catch (e) {
-                    console.log(this.comment, e);
-                }
+                this.context.drawImage(this.image, posX, posY);
             }
             if (showCollision) {
                 this.context.strokeStyle = "rgba(255,0,255,1)";
@@ -2273,14 +2251,13 @@
                 "@@FLASH@@" +
                 __spreadArray([], this.comment.mail, true).sort().join(","), cache = imageCache[cacheKey];
             if (cache) {
+                this.image = cache.image;
+                window.setTimeout(function () {
+                    delete _this.image;
+                }, this.comment.long * 10 + config.cacheAge);
                 clearTimeout(cache.timeout);
                 cache.timeout = window.setTimeout(function () {
-                    if (_this.image) {
-                        delete _this.image;
-                    }
-                    if (cache) {
-                        delete imageCache[cacheKey];
-                    }
+                    delete imageCache[cacheKey];
                 }, this.comment.long * 10 + config.cacheAge);
                 return cache.image;
             }
@@ -2336,6 +2313,16 @@
                     }
                 }
             }
+            this.image = image;
+            window.setTimeout(function () {
+                delete _this.image;
+            }, this.comment.long * 10 + config.cacheAge);
+            imageCache[cacheKey] = {
+                timeout: window.setTimeout(function () {
+                    delete imageCache[cacheKey];
+                }, this.comment.long * 10 + config.cacheAge),
+                image: image,
+            };
             return image;
         };
         return FlashComment;
@@ -2347,7 +2334,6 @@
             if (initOptions === void 0) { initOptions = {}; }
             var constructorStart = performance.now();
             initConfig();
-            initCanvas();
             if (!typeGuard.config.initOptions(initOptions))
                 throw new Error("Please see document: https://xpadev-net.github.io/niconicomments/#p_options");
             setOptions(Object.assign(defaultOptions, initOptions));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xpadev-net/niconicomments",
-  "version": "0.2.33",
+  "version": "0.2.34",
   "description": "NiconiComments is a comment drawing library that is somewhat compatible with the official Nico Nico Douga player.",
   "main": "dist/bundle.js",
   "types": "dist/bundle.d.ts",

package/README.ja.md

@@ -1,41 +0,0 @@
-# [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)
-
-[English](https://github.com/xpadev-net/niconicomments/blob/develop/README.md)
-
-ニコニコ動画の公式プレイヤー互換の高パフォーマンスなコメント描画ライブラリ   
-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
-
-## [重要]このライブラリを使用される方へ
-ニコニコ運営が画面にコメントを流すアドオンを特許侵害だと騒ぎ立てて潰して回っているようです  
-このライブラリ本体は描画部分のみのため特許侵害に当たるとは考えていませんが、ニコニコ動画運営(とその近辺の人)に叩かれる可能性があります  
-(名前は出しませんがすでにいくつかのOSSに被害が出ています)  
-また、このライブラリを使用するかどうかに関わらず、リアルタイムでコメントを取得、画面を描画、コメントの投稿という一連の流れを実装した場合、ニコニコの特許を侵害する可能性があります  
-詳しくはこちら[ニコニコが保有する特許について](https://github.com/xpadev-net/niconicomments/blob/develop/ABOUT_PATENT.md)を参照してください  
-**※当ライブラリを削除する予定は一切ありません**
-
-## Installation
-```html
-<script src="https://cdn.jsdelivr.net/npm/@xpadev-net/niconicomments@latest/dist/bundle.min.js"></script>
-```
-or
-```
-npm i @xpadev-net/niconicomments
-```
-
-## Examples
-```javascript
-const canvas = document.getElementById("canvas");
-const video = document.getElementById("video");
-const req = await fetch("sample.json");
-const res = await req.json();
-const niconiComments = new NiconiComments(canvas, res);
-//video.ontimeupdateを使用すると、呼び出し回数の関係でコメントカクつく
-setInterval(() => niconiComments.drawCanvas(Math.floor(video.currentTime * 100)), 10);
-```
-
-## Sample
-[サンプル](https://xpadev-net.github.io/niconicomments/sample/)