@xpadev-net/niconicomments 0.2.47 → 0.2.48

package/dist/bundle.d.ts

@@ -290,6 +290,63 @@ type BaseConfig = {
 
 export type Config = Partial<BaseConfig>;
 
+export interface CommentEventBase {
+  type: CommentEventName;
+  timeStamp: number;
+  vpos: number;
+}
+
+export interface SeekDisableEvent extends CommentEventBase {
+  type: "seekDisable";
+}
+
+export type SeekDisableEventHandler = (event: SeekDisableEvent) => unknown;
+
+export interface SeekEnableEvent extends CommentEventBase {
+  type: "seekEnable";
+}
+export type SeekEnableEventHandler = (event: SeekEnableEvent) => unknown;
+
+export interface CommentDisableEvent extends CommentEventBase {
+  type: "commentDisable";
+}
+export type CommentDisableEventHandler = (
+  event: CommentDisableEvent
+) => unknown;
+
+export interface CommentEnableEvent extends CommentEventBase {
+  type: "commentEnable";
+}
+export type CommentEnableEventHandler = (event: CommentEnableEvent) => unknown;
+
+export interface JumpEvent extends CommentEventBase {
+  type: "jump";
+  to: string;
+  message?: string;
+}
+export type JumpEventHandler = (event: JumpEvent) => unknown;
+
+export type CommentEventName =
+  | "seekDisable"
+  | "seekEnable"
+  | "commentDisable"
+  | "commentEnable"
+  | "jump";
+export interface CommentEventHandlerMap {
+  seekDisable: SeekDisableEventHandler;
+  seekEnable: SeekEnableEventHandler;
+  commentDisable: CommentDisableEventHandler;
+  commentEnable: CommentEnableEventHandler;
+  jump: JumpEventHandler;
+}
+export interface CommentEventMap {
+  seekDisable: SeekDisableEvent;
+  seekEnable: SeekEnableEvent;
+  commentDisable: CommentDisableEvent;
+  commentEnable: CommentEnableEvent;
+  jump: JumpEvent;
+}
+
 type platform =
   | "win7"
   | "win8_1"
@@ -373,27 +430,27 @@ export type ownerComment = {
   comment: string;
 };
 
-export type v1Thread = {
-  id: string;
-  fork: string;
-  commentCount: number;
-  comments: v1Comment[];
-};
-type v1Comment = {
-  id: string;
-  no: number;
-  vposMs: number;
-  body: string;
-  commands: string[];
-  userId: string;
-  isPremium: boolean;
-  score: number;
-  postedAt: string;
-  nicoruCount: number;
-  nicoruId: undefined;
-  source: string;
-  isMyPost: boolean;
-};
+export type v1Thread = {
+  id: string;
+  fork: string;
+  commentCount: number;
+  comments: v1Comment[];
+};
+type v1Comment = {
+  id: string;
+  no: number;
+  vposMs: number;
+  body: string;
+  commands: string[];
+  userId: string;
+  isPremium: boolean;
+  score: number;
+  postedAt: string;
+  nicoruCount: number;
+  nicoruId: undefined;
+  source: string;
+  isMyPost: boolean;
+};
 
 
 
@@ -537,6 +594,18 @@ type nicoScript = {
   ban: nicoScriptBan[];
   default: nicoScriptDefault[];
   replace: nicoScriptReplace[];
+  seekDisable: nicoScriptSeekDisable[];
+  jump: nicoScriptJump[];
+};
+type nicoScriptSeekDisable = {
+  start: number;
+  end: number;
+};
+type nicoScriptJump = {
+  start: number;
+  end?: number;
+  to: string;
+  message?: string;
 };
 type nicoScriptReverse = {
   target: nicoScriptReverseTarget;
@@ -623,6 +692,14 @@ type measureInput = {
   charSize: number;
   lineCount: number;
 };
+
+type valueOf<T> = T[keyof T];
+
+
+declare const registerHandler: <K extends keyof CommentEventHandlerMap>(eventName: K, handler: CommentEventHandlerMap[K]) => void;
+declare const removeHandler: <K extends keyof CommentEventHandlerMap>(eventName: K, handler: CommentEventHandlerMap[K]) => void;
+declare const triggerHandler: (vpos: number, lastVpos: number) => void;
+
 
 
 
@@ -631,6 +708,7 @@ declare const convert2formattedComment: (data: unknown, type: inputFormatType) =
 
 
 
+
 declare class NiconiComments {
     enableLegacyPiP: boolean;
     showCollision: boolean;
@@ -701,6 +779,8 @@ declare class NiconiComments {
     private sortComment;
     addComments(...rawComments: formattedComment[]): void;
     drawCanvas(vpos: number, forceRendering?: boolean): boolean;
+    addEventListener<K extends keyof CommentEventHandlerMap>(eventName: K, handler: CommentEventHandlerMap[K]): void;
+    removeEventListener<K extends keyof CommentEventHandlerMap>(eventName: K, handler: CommentEventHandlerMap[K]): void;
     clear(): void;
 }
 

package/dist/bundle.js

@@ -1,5 +1,5 @@
 /*!
-  niconicomments.js v0.2.47
+  niconicomments.js v0.2.48
   (c) 2021 xpadev-net https://xpadev.net
   Released under the MIT License.
 */
@@ -918,6 +918,8 @@
         default: [],
         replace: [],
         ban: [],
+        seekDisable: [],
+        jump: [],
     };
     var resetNicoScripts = function () {
         nicoScripts = {
@@ -925,6 +927,8 @@
             default: [],
             replace: [],
             ban: [],
+            seekDisable: [],
+            jump: [],
         };
     };
 
@@ -1088,107 +1092,8 @@
     };
     var parseCommandAndNicoScript = function (comment) {
         var isFlash = isFlashComment(comment);
-        var data = parseCommand(comment), string = comment.content, nicoscript = string.match(/^(?:@|\uff20)(\u30c7\u30d5\u30a9\u30eb\u30c8|\u7f6e\u63db|\u9006|\u30b3\u30e1\u30f3\u30c8\u7981\u6b62|\u30b7\u30fc\u30af\u7981\u6b62|\u30b8\u30e3\u30f3\u30d7)/);
-        if (nicoscript && comment.owner) {
-            var reverse = comment.content.match(/^(?:@|\uff20)\u9006(?:\s+)?(\u5168|\u30b3\u30e1|\u6295\u30b3\u30e1)?/);
-            var content = comment.content.split(""), result = [];
-            var quote = "", last_i = "", string_1 = "";
-            if (nicoscript[1] === "\u30c7\u30d5\u30a9\u30eb\u30c8") {
-                nicoScripts.default.unshift({
-                    start: comment.vpos,
-                    long: data.long === undefined ? undefined : Math.floor(data.long * 100),
-                    color: data.color,
-                    size: data.size,
-                    font: data.font,
-                    loc: data.loc,
-                });
-            }
-            else if (nicoscript[1] === "\u9006" &&
-                reverse &&
-                reverse[1] &&
-                typeGuard.nicoScript.range.target(reverse[1])) {
-                if (data.long === undefined) {
-                    data.long = 30;
-                }
-                nicoScripts.reverse.unshift({
-                    start: comment.vpos,
-                    end: comment.vpos + data.long * 100,
-                    target: reverse[1],
-                });
-            }
-            else if (nicoscript[1] === "\u30b3\u30e1\u30f3\u30c8\u7981\u6b62") {
-                if (data.long === undefined) {
-                    data.long = 30;
-                }
-                nicoScripts.ban.unshift({
-                    start: comment.vpos,
-                    end: comment.vpos + data.long * 100,
-                });
-            }
-            else if (nicoscript[1] === "\u7f6e\u63db") {
-                for (var _i = 0, _a = content.slice(4); _i < _a.length; _i++) {
-                    var i = _a[_i];
-                    if (i.match(/["'\u300c]/) && quote === "") {
-                        quote = i;
-                    }
-                    else if (i.match(/["']/) && quote === i && last_i !== "\\") {
-                        result.push(string_1.replaceAll("\\n", "\n"));
-                        quote = "";
-                        string_1 = "";
-                    }
-                    else if (i.match(/\u300d/) && quote === "\u300c") {
-                        result.push(string_1);
-                        quote = "";
-                        string_1 = "";
-                    }
-                    else if (quote === "" && i.match(/\s+/)) {
-                        if (string_1) {
-                            result.push(string_1);
-                            string_1 = "";
-                        }
-                    }
-                    else {
-                        string_1 += i;
-                    }
-                    last_i = i;
-                }
-                result.push(string_1);
-                if (!(result[0] === undefined ||
-                    (result[2] !== undefined &&
-                        !typeGuard.nicoScript.replace.range(result[2])) ||
-                    (result[3] !== undefined &&
-                        !typeGuard.nicoScript.replace.target(result[3])) ||
-                    (result[4] !== undefined &&
-                        !typeGuard.nicoScript.replace.condition(result[4])))) {
-                    nicoScripts.replace.unshift({
-                        start: comment.vpos,
-                        long: data.long === undefined ? undefined : Math.floor(data.long * 100),
-                        keyword: result[0],
-                        replace: result[1] || "",
-                        range: result[2] || "\u5358",
-                        target: result[3] || "\u30b3\u30e1",
-                        condition: result[4] || "\u90e8\u5206\u4e00\u81f4",
-                        color: data.color,
-                        size: data.size,
-                        font: data.font,
-                        loc: data.loc,
-                        no: comment.id,
-                    });
-                    nicoScripts.replace.sort(function (a, b) {
-                        if (a.start < b.start)
-                            return -1;
-                        if (a.start > b.start)
-                            return 1;
-                        if (a.no < b.no)
-                            return -1;
-                        if (a.no > b.no)
-                            return 1;
-                        return 0;
-                    });
-                }
-            }
-            data.invisible = true;
-        }
+        var commands = parseCommand(comment);
+        processNicoscript(comment, commands);
         var color = undefined, size = undefined, font = undefined, loc = undefined;
         for (var i = 0; i < nicoScripts.default.length; i++) {
             var item = nicoScripts.default[i];
@@ -1236,40 +1141,173 @@
                     comment.content = item.replace;
                 }
                 if (item.loc) {
-                    data.loc = item.loc;
+                    commands.loc = item.loc;
                 }
                 if (item.color) {
-                    data.color = item.color;
+                    commands.color = item.color;
                 }
                 if (item.size) {
-                    data.size = item.size;
-                    data.fontSize = getConfig(config.fontSize, isFlash)[data.size].default;
+                    commands.size = item.size;
+                    commands.fontSize = getConfig(config.fontSize, isFlash)[commands.size].default;
                 }
                 if (item.font) {
-                    data.font = item.font;
+                    commands.font = item.font;
                 }
             }
         }
-        if (!data.loc) {
-            data.loc = loc || "naka";
+        if (!commands.loc) {
+            commands.loc = loc || "naka";
         }
-        if (!data.color) {
-            data.color = color || "#FFFFFF";
+        if (!commands.color) {
+            commands.color = color || "#FFFFFF";
         }
-        if (!data.size) {
-            data.size = size || "medium";
-            data.fontSize = getConfig(config.fontSize, isFlash)[data.size].default;
+        if (!commands.size) {
+            commands.size = size || "medium";
+            commands.fontSize = getConfig(config.fontSize, isFlash)[commands.size].default;
         }
-        if (!data.font) {
-            data.font = font || "defont";
+        if (!commands.font) {
+            commands.font = font || "defont";
         }
-        if (!data.long) {
-            data.long = 300;
+        if (!commands.long) {
+            commands.long = 300;
         }
         else {
-            data.long = Math.floor(Number(data.long) * 100);
+            commands.long = Math.floor(Number(commands.long) * 100);
+        }
+        return _assign(_assign(_assign(_assign({}, comment), { content: [], lineCount: 0, lineOffset: 0 }), commands), { flash: isFlash });
+    };
+    var processNicoscript = function (comment, commands) {
+        var nicoscript = comment.content.match(/^(?:@|\uff20)(\u30c7\u30d5\u30a9\u30eb\u30c8|\u7f6e\u63db|\u9006|\u30b3\u30e1\u30f3\u30c8\u7981\u6b62|\u30b7\u30fc\u30af\u7981\u6b62|\u30b8\u30e3\u30f3\u30d7)(.*)/);
+        if (!nicoscript || !comment.owner)
+            return;
+        commands.invisible = true;
+        if (nicoscript[1] === "\u30c7\u30d5\u30a9\u30eb\u30c8") {
+            nicoScripts.default.unshift({
+                start: comment.vpos,
+                long: commands.long === undefined
+                    ? undefined
+                    : Math.floor(commands.long * 100),
+                color: commands.color,
+                size: commands.size,
+                font: commands.font,
+                loc: commands.loc,
+            });
+            return;
+        }
+        if (nicoscript[1] === "\u9006") {
+            var reverse = comment.content.match(/^(?:@|\uff20)\u9006(?:\s+)?(\u5168|\u30b3\u30e1|\u6295\u30b3\u30e1)?/);
+            if (!reverse ||
+                !reverse[1] ||
+                !typeGuard.nicoScript.range.target(reverse[1]))
+                return;
+            if (commands.long === undefined) {
+                commands.long = 30;
+            }
+            nicoScripts.reverse.unshift({
+                start: comment.vpos,
+                end: comment.vpos + commands.long * 100,
+                target: reverse[1],
+            });
+            return;
+        }
+        if (nicoscript[1] === "\u30b3\u30e1\u30f3\u30c8\u7981\u6b62") {
+            if (commands.long === undefined) {
+                commands.long = 30;
+            }
+            nicoScripts.ban.unshift({
+                start: comment.vpos,
+                end: comment.vpos + commands.long * 100,
+            });
+            return;
+        }
+        if (nicoscript[1] === "\u30b7\u30fc\u30af\u7981\u6b62") {
+            if (commands.long === undefined) {
+                commands.long = 30;
+            }
+            nicoScripts.seekDisable.unshift({
+                start: comment.vpos,
+                end: comment.vpos + commands.long * 100,
+            });
+            return;
+        }
+        if (nicoscript[1] === "\u30b8\u30e3\u30f3\u30d7" && nicoscript[2]) {
+            var to = nicoscript[2].match(/\s*((?:sm|so|nm|\uff53\uff4d|\uff53\uff4f|\uff4e\uff4d)?[1-9\uff11-\uff19][0-9\uff11-\uff19]*|#[0-9]+:[0-9]+(?:\.[0-9]+)?)\s+(.*)/);
+            if (!to || !to[1])
+                return;
+            nicoScripts.jump.unshift({
+                start: comment.vpos,
+                end: commands.long === undefined ? undefined : commands.long * 100,
+                to: to[1],
+                message: to[2],
+            });
+            return;
+        }
+        if (nicoscript[1] === "\u7f6e\u63db") {
+            var content = comment.content.split(""), result = [];
+            var quote = "", last_i = "", string = "";
+            for (var _i = 0, _a = content.slice(4); _i < _a.length; _i++) {
+                var i = _a[_i];
+                if (i.match(/["'\u300c]/) && quote === "") {
+                    quote = i;
+                }
+                else if (i.match(/["']/) && quote === i && last_i !== "\\") {
+                    result.push(string.replaceAll("\\n", "\n"));
+                    quote = "";
+                    string = "";
+                }
+                else if (i.match(/\u300d/) && quote === "\u300c") {
+                    result.push(string);
+                    quote = "";
+                    string = "";
+                }
+                else if (quote === "" && i.match(/\s+/)) {
+                    if (string) {
+                        result.push(string);
+                        string = "";
+                    }
+                }
+                else {
+                    string += i;
+                }
+                last_i = i;
+            }
+            result.push(string);
+            if (result[0] === undefined ||
+                (result[2] !== undefined &&
+                    !typeGuard.nicoScript.replace.range(result[2])) ||
+                (result[3] !== undefined &&
+                    !typeGuard.nicoScript.replace.target(result[3])) ||
+                (result[4] !== undefined &&
+                    !typeGuard.nicoScript.replace.condition(result[4])))
+                return;
+            nicoScripts.replace.unshift({
+                start: comment.vpos,
+                long: commands.long === undefined
+                    ? undefined
+                    : Math.floor(commands.long * 100),
+                keyword: result[0],
+                replace: result[1] || "",
+                range: result[2] || "\u5358",
+                target: result[3] || "\u30b3\u30e1",
+                condition: result[4] || "\u90e8\u5206\u4e00\u81f4",
+                color: commands.color,
+                size: commands.size,
+                font: commands.font,
+                loc: commands.loc,
+                no: comment.id,
+            });
+            nicoScripts.replace.sort(function (a, b) {
+                if (a.start < b.start)
+                    return -1;
+                if (a.start > b.start)
+                    return 1;
+                if (a.no < b.no)
+                    return -1;
+                if (a.no > b.no)
+                    return 1;
+                return 0;
+            });
         }
-        return _assign(_assign(_assign(_assign({}, comment), { content: [], lineCount: 0, lineOffset: 0 }), data), { flash: isFlash });
     };
     var parseCommand = function (comment) {
         var metadata = comment.mail, isFlash = isFlashComment(comment);
@@ -2336,6 +2374,106 @@
         plugins = input;
     };
 
+    var handlerList = [];
+    var handlerCounts = {
+        seekDisable: 0,
+        seekEnable: 0,
+        commentDisable: 0,
+        commentEnable: 0,
+        jump: 0,
+    };
+    var registerHandler = function (eventName, handler) {
+        handlerList.push({ eventName: eventName, handler: handler });
+        updateEventHandlerCounts();
+    };
+    var removeHandler = function (eventName, handler) {
+        handlerList = handlerList.filter(function (item) { return item.eventName !== eventName || item.handler !== handler; });
+        updateEventHandlerCounts();
+    };
+    var updateEventHandlerCounts = function () {
+        var _loop_1 = function (key_) {
+            var key = key_;
+            handlerCounts[key] = handlerList.filter(function (item) { return item.eventName === key; }).length;
+        };
+        for (var key_ in handlerCounts) {
+            _loop_1(key_);
+        }
+    };
+    var triggerHandler = function (vpos, lastVpos) {
+        processCommentDisableScript(vpos, lastVpos);
+        processSeekDisableScript(vpos, lastVpos);
+        processJumpScript(vpos, lastVpos);
+    };
+    var processCommentDisableScript = function (vpos, lastVpos) {
+        if (handlerCounts.commentDisable < 1 && handlerCounts.commentEnable < 1)
+            return;
+        for (var _i = 0, _a = nicoScripts.ban; _i < _a.length; _i++) {
+            var range = _a[_i];
+            var vposInRange = range.start < vpos && vpos < range.end, lastVposInRange = range.start < lastVpos && lastVpos < range.end;
+            if (vposInRange && !lastVposInRange) {
+                executeEvents("commentDisable", {
+                    type: "commentDisable",
+                    timeStamp: new Date().getTime(),
+                    vpos: vpos,
+                });
+            }
+            else if (!vposInRange && lastVposInRange) {
+                executeEvents("commentEnable", {
+                    type: "commentEnable",
+                    timeStamp: new Date().getTime(),
+                    vpos: vpos,
+                });
+            }
+        }
+    };
+    var processSeekDisableScript = function (vpos, lastVpos) {
+        if (handlerCounts.seekDisable < 1 && handlerCounts.seekEnable < 1)
+            return;
+        for (var _i = 0, _a = nicoScripts.seekDisable; _i < _a.length; _i++) {
+            var range = _a[_i];
+            var vposInRange = range.start < vpos && vpos < range.end, lastVposInRange = range.start < lastVpos && lastVpos < range.end;
+            if (vposInRange && !lastVposInRange) {
+                executeEvents("seekDisable", {
+                    type: "seekDisable",
+                    timeStamp: new Date().getTime(),
+                    vpos: vpos,
+                });
+            }
+            else if (!vposInRange && lastVposInRange) {
+                executeEvents("seekEnable", {
+                    type: "seekEnable",
+                    timeStamp: new Date().getTime(),
+                    vpos: vpos,
+                });
+            }
+        }
+    };
+    var processJumpScript = function (vpos, lastVpos) {
+        if (handlerCounts.jump < 1)
+            return;
+        for (var _i = 0, _a = nicoScripts.jump; _i < _a.length; _i++) {
+            var range = _a[_i];
+            var vposInRange = range.start < vpos && (!range.end || vpos < range.end), lastVposInRange = range.start < lastVpos && (!range.end || lastVpos < range.end);
+            if (vposInRange && !lastVposInRange) {
+                executeEvents("jump", {
+                    type: "jump",
+                    timeStamp: new Date().getTime(),
+                    vpos: vpos,
+                    to: range.to,
+                    message: range.message,
+                });
+            }
+        }
+    };
+    var executeEvents = function (eventName, event) {
+        for (var _i = 0, handlerList_1 = handlerList; _i < handlerList_1.length; _i++) {
+            var item = handlerList_1[_i];
+            if (eventName !== item.eventName)
+                continue;
+            item.handler(event);
+        }
+    };
+
     var isDebug = false;
     var NiconiComments = (function () {
         function NiconiComments(canvas, data, initOptions) {
@@ -2645,6 +2783,7 @@
             var drawCanvasStart = performance.now();
             if (this.lastVpos === vpos && !forceRendering)
                 return false;
+            triggerHandler(vpos, this.lastVpos);
             var timelineRange = this.timeline[vpos];
             if (!forceRendering &&
                 (timelineRange === null || timelineRange === void 0 ? void 0 : timelineRange.filter(function (item) { return item.loc === "naka"; }).length) === 0 &&
@@ -2719,6 +2858,12 @@
             logger("drawCanvas complete: ".concat(performance.now() - drawCanvasStart, "ms"));
             return true;
         };
+        NiconiComments.prototype.addEventListener = function (eventName, handler) {
+            registerHandler(eventName, handler);
+        };
+        NiconiComments.prototype.removeEventListener = function (eventName, handler) {
+            removeHandler(eventName, handler);
+        };
         NiconiComments.prototype.clear = function () {
             this.context.clearRect(0, 0, config.canvasWidth, config.canvasHeight);
         };

package/package.json

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