@xpadev-net/niconicomments 0.2.52 → 0.2.54

package/LICENSE

@@ -1,21 +1,21 @@
-MIT License
-
-Copyright (c) 2022 xpadev-net
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+MIT License
+
+Copyright (c) 2022 xpadev-net
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/README.en.md

@@ -1,53 +1,53 @@
-# [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)
-[![CodeQL](https://github.com/xpadev-net/niconicomments/actions/workflows/codeql-analysis.yml/badge.svg?branch=master)](https://github.com/xpadev-net/niconicomments/actions/workflows/codeql-analysis.yml)
-[![TypeDoc](https://github.com/xpadev-net/niconicomments/actions/workflows/typedoc.yml/badge.svg?branch=master)](https://github.com/xpadev-net/niconicomments/actions/workflows/typedoc.yml)
-
-[[日本語](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
-
-## 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/)
-
-### 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)
+# [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)
+[![CodeQL](https://github.com/xpadev-net/niconicomments/actions/workflows/codeql-analysis.yml/badge.svg?branch=master)](https://github.com/xpadev-net/niconicomments/actions/workflows/codeql-analysis.yml)
+[![TypeDoc](https://github.com/xpadev-net/niconicomments/actions/workflows/typedoc.yml/badge.svg?branch=master)](https://github.com/xpadev-net/niconicomments/actions/workflows/typedoc.yml)
+
+[[日本語](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
+
+## 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/)
+
+### 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)

package/README.md

@@ -1,51 +1,51 @@
-# [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)
-[![CodeQL](https://github.com/xpadev-net/niconicomments/actions/workflows/codeql-analysis.yml/badge.svg?branch=master)](https://github.com/xpadev-net/niconicomments/actions/workflows/codeql-analysis.yml)
-[![TypeDoc](https://github.com/xpadev-net/niconicomments/actions/workflows/typedoc.yml/badge.svg?branch=master)](https://github.com/xpadev-net/niconicomments/actions/workflows/typedoc.yml)
-
-[[English](https://github.com/xpadev-net/niconicomments/blob/develop/README.en.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
-
-
-## 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/)
-
-
-### このライブラリを使用される方へ
-
-このライブラリを使用するかどうかに関わらず、リアルタイムでコメントを取得、画面を描画、コメントの投稿という一連の流れを実装した場合、ニコニコの特許を侵害する可能性があります  
+# [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)
+[![CodeQL](https://github.com/xpadev-net/niconicomments/actions/workflows/codeql-analysis.yml/badge.svg?branch=master)](https://github.com/xpadev-net/niconicomments/actions/workflows/codeql-analysis.yml)
+[![TypeDoc](https://github.com/xpadev-net/niconicomments/actions/workflows/typedoc.yml/badge.svg?branch=master)](https://github.com/xpadev-net/niconicomments/actions/workflows/typedoc.yml)
+
+[[English](https://github.com/xpadev-net/niconicomments/blob/develop/README.en.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
+
+
+## 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/)
+
+
+### このライブラリを使用される方へ
+
+このライブラリを使用するかどうかに関わらず、リアルタイムでコメントを取得、画面を描画、コメントの投稿という一連の流れを実装した場合、ニコニコの特許を侵害する可能性があります  
 詳しくはこちら[ニコニコが保有する特許について](https://github.com/xpadev-net/niconicomments/blob/develop/ABOUT_PATENT.md)を参照してください  

package/dist/bundle.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="node" />
-type Canvas = HTMLCanvasElement;
+type Canvas = HTMLCanvasElement;
 type Context2D = CanvasRenderingContext2D;
 
 declare class BaseComment implements IComment {
@@ -30,6 +30,7 @@ declare class BaseComment implements IComment {
     draw(vpos: number, showCollision: boolean, debug: boolean): void;
     protected _draw(posX: number, posY: number): void;
     protected _drawRectColor(posX: number, posY: number): void;
+    protected _drawBackgroundColor(posX: number, posY: number): void;
     protected _drawDebugInfo(posX: number, posY: number, debug: boolean): void;
     protected _drawCollision(posX: number, posY: number, showCollision: boolean): void;
     protected getTextImage(): Canvas | null;
@@ -457,6 +458,7 @@ type FormattedCommentWithFont = {
   color: string;
   strokeColor?: string;
   wakuColor?: string;
+  fillColor?: string;
   full: boolean;
   ender: boolean;
   _live: boolean;
@@ -491,6 +493,7 @@ type ParseCommandAndNicoScriptResult = {
   color: string;
   strokeColor?: string;
   wakuColor?: string;
+  fillColor?: string;
   font: CommentFont;
   full: boolean;
   ender: boolean;
@@ -595,6 +598,7 @@ type ParsedCommand = {
   color: string | undefined;
   strokeColor?: string;
   wakuColor?: string;
+  fillColor?: string;
   font: CommentFont | undefined;
   full: boolean;
   ender: boolean;

package/dist/bundle.js

@@ -1,5 +1,5 @@
 /*!
-  niconicomments.js v0.2.52
+  niconicomments.js v0.2.54
   (c) 2021 xpadev-net https://xpadev.net
   Released under the MIT License.
 */
@@ -549,6 +549,7 @@
             invisible: commands.invisible,
             strokeColor: commands.strokeColor,
             wakuColor: commands.wakuColor,
+            fillColor: commands.fillColor,
         };
     };
     const parseBrackets = (input) => {
@@ -743,6 +744,11 @@
             result.wakuColor ??= rectColor;
             return;
         }
+        const fillColor = getColor(command.match(/^nico:fill:(.+)$/));
+        if (fillColor) {
+            result.fillColor ??= fillColor;
+            return;
+        }
         if (typeGuard.comment.loc(command)) {
             result.loc ??= command;
             return;
@@ -1381,6 +1387,7 @@
             const posY = this.comment.loc === "shita"
                 ? config.canvasHeight - this.posY - this.comment.height
                 : this.posY;
+            this._drawBackgroundColor(posX, posY);
             this._draw(posX, posY);
             this._drawRectColor(posX, posY);
             this._drawCollision(posX, posY, showCollision);
@@ -1410,6 +1417,14 @@
                 this.context.restore();
             }
         }
+        _drawBackgroundColor(posX, posY) {
+            if (this.comment.fillColor) {
+                this.context.save();
+                this.context.fillStyle = this.comment.fillColor;
+                this.context.fillRect(posX, posY, this.comment.width, this.comment.height);
+                this.context.restore();
+            }
+        }
         _drawDebugInfo(posX, posY, debug) {
             if (debug) {
                 this.context.save();
@@ -2534,7 +2549,7 @@
             }
             const tmpParam = {
                 id: i,
-                vpos: Number(commentData[0]),
+                vpos: Number(commentData[0]) * 100,
                 content: commentData[2] || "",
                 date: i,
                 date_usec: 0,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xpadev-net/niconicomments",
-  "version": "0.2.52",
+  "version": "0.2.54",
   "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",