@akashic/headless-driver 2.15.11 → 2.16.0

package/lib/Logger.js

@@ -1,12 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getSystemLogger = exports.setSystemLogger = void 0;
+exports.setSystemLogger = setSystemLogger;
+exports.getSystemLogger = getSystemLogger;
 let _logger = console;
 function setSystemLogger(logger) {
     _logger = logger;
 }
-exports.setSystemLogger = setSystemLogger;
 function getSystemLogger() {
     return _logger;
 }
-exports.getSystemLogger = getSystemLogger;

package/lib/play/amflow/ErrorFactory.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createError = exports.TokenRevokedError = exports.RuntimeError = exports.BadRequestError = exports.TimeoutError = exports.NotImplementedError = exports.PermissionError = exports.InvalidStatusError = exports.AMFlowError = void 0;
+exports.TokenRevokedError = exports.RuntimeError = exports.BadRequestError = exports.TimeoutError = exports.NotImplementedError = exports.PermissionError = exports.InvalidStatusError = exports.AMFlowError = void 0;
+exports.createError = createError;
 class AMFlowError extends Error {
     constructor(message) {
         super(message);
@@ -99,4 +100,3 @@ function createError(type, message) {
     }
     return new RuntimeError(message);
 }
-exports.createError = createError;

package/lib/runner/Runner.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import type { AMFlow } from "@akashic/amflow";
 import { Trigger } from "@akashic/trigger";
 import { TimeKeeper } from "../TimeKeeper";

package/lib/runner/Runner.js

@@ -79,8 +79,8 @@ class Runner {
      * @param condition 進めるまでの条件となる関数。
      * @param timeout タイムアウトまでのミリ秒数。省略時は `5000` 。ゲーム内時間ではなく実時間である点に注意。
      */
-    advanceUntil(condition, timeout = 5000) {
-        return __awaiter(this, void 0, void 0, function* () {
+    advanceUntil(condition_1) {
+        return __awaiter(this, arguments, void 0, function* (condition, timeout = 5000) {
             return new Promise((resolve, reject) => {
                 const limit = performance.now() + timeout;
                 const handler = () => {

package/lib/runner/RunnerManager.d.ts

@@ -25,8 +25,9 @@ export interface CreateRunnerParameters {
     trusted?: boolean;
     /**
      * レンダリングモード。
-     * `"canvas"` を指定するとプライマリサーフェスの描画内容を `Runner#getPrimarySurface()` を経由して取得できる。
+     * `"canvas"` または `"@napi-rs/canvas"` を指定するとプライマリサーフェスの描画内容を `Runner#getPrimarySurface()` を経由して取得できる。
      * `"canvas"` を指定した場合、利用側で node-canvas をインストールしなければならない。
+     * `"@napi-rs/canvas"` を指定した場合、利用側で @napi-rs/canvas をインストールしなければならない。
      * 初期値は `"none"` 。
      */
     renderingMode?: RunnerRenderingMode;

package/lib/runner/types.d.ts

@@ -1,7 +1,19 @@
 import type { EncodingType } from "../utils";
 export type RunnerExecutionMode = "active" | "passive";
 export type RunnerLoopMode = "realtime" | "replay";
-export type RunnerRenderingMode = "none" | "canvas";
+export type RunnerRenderingMode = 
+/**
+ * レンダリングを行わない。
+ */
+"none"
+/**
+ * node-canvas を使用する。
+ */
+ | "canvas"
+/**
+ * @napi-rs/canvas を使用する。
+ */
+ | "@napi-rs/canvas";
 export type RunnerAdvanceConditionFunc = () => boolean;
 export interface RunnerPointEvent {
     type: "down" | "move" | "up";

package/lib/runner/v3/RunnerV3.d.ts

@@ -1,10 +1,9 @@
-/** @ts-ignore */
-import type { Canvas } from "canvas";
 import type { RunnerStartParameters } from "../Runner";
 import { Runner } from "../Runner";
 import type { RunnerPointEvent } from "../types";
 import { akashicEngine as g, gameDriver as gdr } from "./engineFiles";
 import type { NodeCanvasSurface } from "./platform/graphics/canvas/NodeCanvasSurface";
+import type { Canvas } from "./platform/graphics/canvas/types";
 import type { NullSurface } from "./platform/graphics/null/NullSurface";
 import { PlatformV3 } from "./platform/PlatformV3";
 export type RunnerV3Game = g.Game;
@@ -30,7 +29,7 @@ export declare class RunnerV3 extends Runner {
     getPrimarySurface(): NullSurface | NodeCanvasSurface;
     /**
      * プライマリサーフェスの Canvas インスタンスを取得する。
-     * @returns node-canvas の Canvas
+     * @returns Canvas
      */
     getPrimarySurfaceCanvas(): Canvas;
     protected _stepMinimal(): void;

package/lib/runner/v3/RunnerV3.js

@@ -50,7 +50,7 @@ class RunnerV3 extends Runner_1.Runner {
     }
     pause() {
         if (this.platform == null) {
-            this.errorTrigger.fire(new Error("Cannot call Runner#pause() before initialized"));
+            this.errorTrigger.fire(new Error("Cannot call Runner#pause() before initialization"));
             return;
         }
         this.platform.pauseLoopers();
@@ -59,7 +59,7 @@ class RunnerV3 extends Runner_1.Runner {
     }
     resume() {
         if (this.platform == null) {
-            this.errorTrigger.fire(new Error("Cannot call Runner#resume() before initialized"));
+            this.errorTrigger.fire(new Error("Cannot call Runner#resume() before initialization"));
             return;
         }
         this.platform.resumeLoopers();
@@ -69,7 +69,7 @@ class RunnerV3 extends Runner_1.Runner {
     step() {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.fps == null || this.platform == null) {
-                this.errorTrigger.fire(new Error("Cannot call Runner#step() before initialized"));
+                this.errorTrigger.fire(new Error("Cannot call Runner#step() before initialization"));
                 return;
             }
             if (this.running) {
@@ -88,11 +88,11 @@ class RunnerV3 extends Runner_1.Runner {
     advance(ms) {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.fps == null || this.platform == null || this.driver == null) {
-                this.errorTrigger.fire(new Error("Cannot call Runner#advance() before initialized"));
+                this.errorTrigger.fire(new Error("Cannot call Runner#advance() before initialization"));
                 return;
             }
             if (this.running) {
-                this.errorTrigger.fire(new Error("Cannot call Runner#advance() in running"));
+                this.errorTrigger.fire(new Error("Cannot call Runner#advance() while running"));
                 return;
             }
             const loopConfiguration = this.driver.getLoopConfiguration();
@@ -128,7 +128,7 @@ class RunnerV3 extends Runner_1.Runner {
     }
     firePointEvent(event) {
         if (this.platform == null) {
-            this.errorTrigger.fire(new Error("Cannot call Runner#firePointEvent() before initialized"));
+            this.errorTrigger.fire(new Error("Cannot call Runner#firePointEvent() before initialization"));
             return;
         }
         let type;
@@ -157,30 +157,27 @@ class RunnerV3 extends Runner_1.Runner {
      */
     getPrimarySurface() {
         if (!this.platform) {
-            throw new Error("RunnerV3#getPrimarySurface(): Platform has not been initialized");
-        }
-        if (this.renderingMode === "canvas") {
-            return this.platform.getPrimarySurface();
+            throw new Error("RunnerV3#getPrimarySurface(): Platform is not initialized");
         }
         return this.platform.getPrimarySurface();
     }
     /**
      * プライマリサーフェスの Canvas インスタンスを取得する。
-     * @returns node-canvas の Canvas
+     * @returns Canvas
      */
     getPrimarySurfaceCanvas() {
-        if (this.renderingMode !== "canvas") {
-            throw Error("RunnerV3#getPrimarySurface(): Not supported except in the case of renderingMode === 'canvas");
+        if (this.renderingMode !== "canvas" && this.renderingMode !== "@napi-rs/canvas") {
+            throw Error("RunnerV3#getPrimarySurface(): Supported only when 'renderingMode' is 'canvas' or '@napi-rs/canvas'");
         }
         return this.getPrimarySurface()._drawable;
     }
     _stepMinimal() {
         if (this.fps == null || this.platform == null) {
-            this.errorTrigger.fire(new Error("RunnerV3#_stepMinimal(): Cannot call Runner#step() before initialized"));
+            this.errorTrigger.fire(new Error("RunnerV3#_stepMinimal(): Cannot call Runner#step() before initialization"));
             return;
         }
         if (this.running) {
-            this.errorTrigger.fire(new Error("RunnerV3#_stepMinimal(): Cannot call Runner#step() in running"));
+            this.errorTrigger.fire(new Error("RunnerV3#_stepMinimal(): Cannot call Runner#step() while running"));
             return;
         }
         // NOTE: 現状 PDI の API 仕様により this.step() では厳密なフレーム更新ができない。そこで、一フレームの 1/2 の時間で進行することでフレームが飛んでしまうことを防止する。

package/lib/runner/v3/platform/NodeCanvasFactory.d.ts

@@ -0,0 +1,10 @@
+import type { RunnerRenderingMode } from "../../types";
+import type { Canvas, Image } from "./graphics/canvas/types";
+export declare class NodeCanvasFactory {
+    renderingMode: RunnerRenderingMode;
+    private module;
+    constructor(renderingMode: RunnerRenderingMode);
+    createCanvas(width: number, height: number): Canvas;
+    createImage(): Image;
+    _loadImage(filepath: string): Promise<Image>;
+}

package/lib/runner/v3/platform/NodeCanvasFactory.js

@@ -0,0 +1,31 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.NodeCanvasFactory = void 0;
+class NodeCanvasFactory {
+    constructor(renderingMode) {
+        this.renderingMode = renderingMode;
+        // NOTE: このファイルの require() 時点で不要な依存モジュールを読み込ませないよう、動的に require() する。
+        // "canvas" と "@napi-rs/canvas" は (このライブラリで使う部分では) API が互換なのでそのまま流用している。
+        // eslint-disable-next-line @typescript-eslint/no-var-requires
+        this.module = require(this.renderingMode === "canvas" ? "canvas" : "@napi-rs/canvas");
+    }
+    createCanvas(width, height) {
+        return this.module.createCanvas(width, height);
+    }
+    createImage() {
+        return new this.module.Image();
+    }
+    _loadImage(filepath) {
+        return new Promise((resolve, reject) => {
+            const img = this.createImage();
+            img.onload = () => {
+                resolve(img);
+            };
+            img.onerror = (err) => {
+                reject(err);
+            };
+            img.src = filepath;
+        });
+    }
+}
+exports.NodeCanvasFactory = NodeCanvasFactory;

package/lib/runner/v3/platform/NodeCanvasResourceFactory.d.ts

@@ -1,18 +1,21 @@
 import type { RunnerLoadFileHandler } from "../../types";
 import type { akashicEngine as g } from "../engineFiles";
+import type { NodeCanvasFactory } from "./NodeCanvasFactory";
 export interface NodeCanvasResourceFactoryParameters {
     loadFileHandler: RunnerLoadFileHandler;
     errorHandler: (err: Error) => void;
+    canvasFactory: NodeCanvasFactory;
 }
 /**
- * node-canvas への描画出力機能を持つ ResourceFactory の実装。
+ * 描画出力機能を持つ ResourceFactory の実装。
  * 音声再生には未対応。
  */
 export declare class NodeCanvasResourceFactory implements g.ResourceFactory {
     private loadFileHandler;
     private errorHandler;
-    constructor({ loadFileHandler, errorHandler }: NodeCanvasResourceFactoryParameters);
-    createImageAsset(id: string, assetPath: string, width: number, height: number): g.ImageAsset;
+    private canvasFactory;
+    constructor({ loadFileHandler, errorHandler, canvasFactory }: NodeCanvasResourceFactoryParameters);
+    createImageAsset(id: string, path: string, width: number, height: number): g.ImageAsset;
     createVideoAsset(id: string, assetPath: string, width: number, height: number, system: g.VideoSystem, loop: boolean, useRealSize: boolean): g.VideoAsset;
     createAudioAsset(id: string, assetPath: string, duration: number, system: g.AudioSystem, loop: boolean, hint: g.AudioAssetHint, offset?: number): g.AudioAsset;
     createAudioPlayer(system: g.AudioSystem): g.AudioPlayer;

package/lib/runner/v3/platform/NodeCanvasResourceFactory.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NodeCanvasResourceFactory = void 0;
-const canvas_1 = require("canvas");
 const NodeBinaryAsset_1 = require("./assets/NodeBinaryAsset");
 const NodeScriptAsset_1 = require("./assets/NodeScriptAsset");
 const NodeTextAsset_1 = require("./assets/NodeTextAsset");
@@ -12,16 +11,17 @@ const NodeCanvasImageAsset_1 = require("./graphics/canvas/NodeCanvasImageAsset")
 const NodeCanvasSurface_1 = require("./graphics/canvas/NodeCanvasSurface");
 const NullVideoAsset_1 = require("./videos/NullVideoAsset");
 /**
- * node-canvas への描画出力機能を持つ ResourceFactory の実装。
+ * 描画出力機能を持つ ResourceFactory の実装。
  * 音声再生には未対応。
  */
 class NodeCanvasResourceFactory {
-    constructor({ loadFileHandler, errorHandler }) {
+    constructor({ loadFileHandler, errorHandler, canvasFactory }) {
         this.loadFileHandler = loadFileHandler;
         this.errorHandler = errorHandler;
+        this.canvasFactory = canvasFactory;
     }
-    createImageAsset(id, assetPath, width, height) {
-        return new NodeCanvasImageAsset_1.NodeCanvasImageAsset(id, assetPath, width, height);
+    createImageAsset(id, path, width, height) {
+        return new NodeCanvasImageAsset_1.NodeCanvasImageAsset({ canvasFactory: this.canvasFactory, id, path, width, height });
     }
     createVideoAsset(id, assetPath, width, height, system, loop, useRealSize) {
         return new NullVideoAsset_1.NullVideoAsset(id, assetPath, width, height, system, loop, useRealSize);
@@ -56,11 +56,11 @@ class NodeCanvasResourceFactory {
         });
     }
     createSurface(width, height) {
-        const canvas = new canvas_1.Canvas(width, height);
+        const canvas = this.canvasFactory.createCanvas(width, height);
         return new NodeCanvasSurface_1.NodeCanvasSurface(canvas);
     }
     createGlyphFactory(fontFamily, fontSize, baselineHeight, fontColor, strokeWidth, strokeColor, strokeOnly, fontWeight) {
-        return new NodeCanvasGlyphFactory_1.NodeCanvasGlyphFactory(fontFamily, fontSize, baselineHeight, fontColor, strokeWidth, strokeColor, strokeOnly, fontWeight);
+        return new NodeCanvasGlyphFactory_1.NodeCanvasGlyphFactory(this.canvasFactory, fontFamily, fontSize, baselineHeight, fontColor, strokeWidth, strokeColor, strokeOnly, fontWeight);
     }
 }
 exports.NodeCanvasResourceFactory = NodeCanvasResourceFactory;

package/lib/runner/v3/platform/PlatformV3.js

@@ -12,34 +12,40 @@ class PlatformV3 extends Platform_1.Platform {
         this.eventHandler = null;
         this.loopers = [];
         this.isLooperPaused = false;
+        let resourceFactory;
         // NOTE: このファイルの require() 時点で ResourceFactory 側の依存モジュールを読み込ませないよう、動的に require() する。
-        // (このモジュールの利用元である headless-driver が NodeVM 上で起動する仕様上の制限のための苦肉の策)
         /* eslint-disable @typescript-eslint/naming-convention, @typescript-eslint/no-var-requires */
-        const ResourceFactory = this.renderingMode === "canvas" && this.trusted
-            ? require("./NodeCanvasResourceFactory").NodeCanvasResourceFactory
-            : require("./NullResourceFactory").NullResourceFactory;
-        /* eslint-enable */
-        this.resFac = new ResourceFactory({
-            errorHandler: (e) => this.errorHandler(e),
-            loadFileHandler: param.loadFileHandler
-        });
+        if ((this.renderingMode === "canvas" || this.renderingMode === "@napi-rs/canvas") && this.trusted) {
+            const ResourceFactory = require("./NodeCanvasResourceFactory").NodeCanvasResourceFactory;
+            const NodeCanvasFactory = require("./NodeCanvasFactory").NodeCanvasFactory;
+            const canvasFactory = new NodeCanvasFactory(this.renderingMode);
+            resourceFactory = new ResourceFactory({
+                canvasFactory,
+                errorHandler: (e) => this.errorHandler(e),
+                loadFileHandler: param.loadFileHandler
+            });
+        }
+        else {
+            const ResourceFactory = require("./NullResourceFactory").NullResourceFactory;
+            resourceFactory = new ResourceFactory({
+                errorHandler: (e) => this.errorHandler(e),
+                loadFileHandler: param.loadFileHandler
+            });
+        }
+        /* eslint-enable @typescript-eslint/naming-convention, @typescript-eslint/no-var-requires */
+        this.resFac = resourceFactory;
     }
     getResourceFactory() {
         return this.resFac;
     }
     setRendererRequirement(requirement) {
         this.rendererReq = requirement;
-        if (this.renderingMode === "canvas") {
+        if (this.renderingMode === "canvas" || this.renderingMode === "@napi-rs/canvas") {
             if (this.trusted) {
-                /* eslint-disable @typescript-eslint/naming-convention, @typescript-eslint/no-var-requires */
-                const Canvas = require("canvas").Canvas;
-                const NodeCanvasSurface = require("./graphics/canvas/NodeCanvasSurface").NodeCanvasSurface;
-                /* eslint-enable */
-                const canvas = new Canvas(this.rendererReq.primarySurfaceWidth, this.rendererReq.primarySurfaceHeight);
-                this.primarySurface = new NodeCanvasSurface(canvas);
+                this.primarySurface = this.resFac.createSurface(this.rendererReq.primarySurfaceWidth, this.rendererReq.primarySurfaceHeight);
             }
             else {
-                throw Error("PlatformV3#setRendererRequirement(): Must given trusted === `true` if set renderingMode === 'canvas'");
+                throw Error("PlatformV3#setRendererRequirement(): 'trusted' must be true when 'renderingMode' is set to 'canvas' or '@napi-rs/canvas'.");
             }
         }
         else {

package/lib/runner/v3/platform/graphics/canvas/NodeCanvasContext.d.ts

@@ -1,7 +1,6 @@
-/** @ts-ignore */
-import type { CanvasRenderingContext2D, ImageData } from "canvas";
 import type { akashicEngine as g } from "../../../engineFiles";
 import { RenderingState } from "./RenderingState";
+import type { CanvasRenderingContext2D, ImageData } from "./types";
 export declare class NodeCanvasContext {
     protected _context: CanvasRenderingContext2D;
     protected _stateStack: RenderingState[];

package/lib/runner/v3/platform/graphics/canvas/NodeCanvasGlyphFactory.d.ts

@@ -1,4 +1,5 @@
 import type { akashicEngine as g } from "../../../engineFiles";
+import type { NodeCanvasFactory } from "../../NodeCanvasFactory";
 export declare class NodeCanvasGlyphFactory implements g.GlyphFactory {
     /**
      * 実行環境が描画可能な最小フォントサイズ
@@ -18,7 +19,8 @@ export declare class NodeCanvasGlyphFactory implements g.GlyphFactory {
     _marginW: number;
     _marginH: number;
     _cssFontFamily: string;
-    constructor(fontFamily: string | string[], fontSize: number, baselineHeight?: number, fontColor?: string, strokeWidth?: number, strokeColor?: string, strokeOnly?: boolean, fontWeight?: g.FontWeightString);
+    _canvasFactory: NodeCanvasFactory;
+    constructor(canvasFactory: NodeCanvasFactory, fontFamily: string | string[], fontSize: number, baselineHeight?: number, fontColor?: string, strokeWidth?: number, strokeColor?: string, strokeOnly?: boolean, fontWeight?: g.FontWeightString);
     create(code: number): g.Glyph;
     measureMinimumFontSize(): number;
 }

package/lib/runner/v3/platform/graphics/canvas/NodeCanvasGlyphFactory.js

@@ -1,10 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NodeCanvasGlyphFactory = void 0;
-const canvas_1 = require("canvas");
 const NodeCanvasGlyph_1 = require("./NodeCanvasGlyph");
 const NodeCanvasSurface_1 = require("./NodeCanvasSurface");
-function createGlyphRenderedSurface(code, fontSize, cssFontFamily, baselineHeight, marginW, marginH, needImageData, fontColor, strokeWidth, strokeColor, strokeOnly, fontWeight) {
+function createGlyphRenderedSurface(canvasFactory, code, fontSize, cssFontFamily, baselineHeight, marginW, marginH, needImageData, fontColor, strokeWidth, strokeColor, strokeOnly, fontWeight) {
     // 要求されたフォントサイズが描画可能な最小フォントサイズ以下だった場合、必要なスケーリング係数
     const scale = fontSize < NodeCanvasGlyphFactory._environmentMinimumFontSize ? fontSize / NodeCanvasGlyphFactory._environmentMinimumFontSize : 1;
     const surfaceWidth = Math.ceil((fontSize + marginW * 2) * scale);
@@ -13,7 +12,7 @@ function createGlyphRenderedSurface(code, fontSize, cssFontFamily, baselineHeigh
     // 理由:
     // * Renderer#drawSystemText()を廃止または非推奨にしたいのでそれを用いず文字列を描画する
     // * RenderingHelperがcontextの状態を復帰するためTextMetricsを取れない
-    const canvas = new canvas_1.Canvas(surfaceWidth, surfaceHeight);
+    const canvas = canvasFactory.createCanvas(surfaceWidth, surfaceHeight);
     const context = canvas.getContext("2d");
     const str = code & 0xffff0000 ? String.fromCharCode((code & 0xffff0000) >>> 16, code & 0xffff) : String.fromCharCode(code);
     const fontWeightValue = fontWeight === "bold" ? "bold " : "";
@@ -120,7 +119,7 @@ function fontFamily2CSSFontFamily(fontFamily) {
     }
 }
 class NodeCanvasGlyphFactory {
-    constructor(fontFamily, fontSize, baselineHeight = fontSize, fontColor = "black", strokeWidth = 0, strokeColor = "black", strokeOnly = false, fontWeight = "normal") {
+    constructor(canvasFactory, fontFamily, fontSize, baselineHeight = fontSize, fontColor = "black", strokeWidth = 0, strokeColor = "black", strokeOnly = false, fontWeight = "normal") {
         this.fontFamily = fontFamily;
         this.fontSize = fontSize;
         this.fontWeight = fontWeight;
@@ -129,6 +128,7 @@ class NodeCanvasGlyphFactory {
         this.strokeWidth = strokeWidth;
         this.strokeColor = strokeColor;
         this.strokeOnly = strokeOnly;
+        this._canvasFactory = canvasFactory;
         this._glyphAreas = {};
         this._cssFontFamily = fontFamily2CSSFontFamily(fontFamily);
         // Akashicエンジンは指定されたフォントに利用可能なものが見つからない時
@@ -155,7 +155,7 @@ class NodeCanvasGlyphFactory {
         let result = null;
         let glyphArea = this._glyphAreas[code];
         if (!glyphArea) {
-            result = createGlyphRenderedSurface(code, this.fontSize, this._cssFontFamily, this.baselineHeight, this._marginW, this._marginH, true, this.fontColor, this.strokeWidth, this.strokeColor, this.strokeOnly, this.fontWeight);
+            result = createGlyphRenderedSurface(this._canvasFactory, code, this.fontSize, this._cssFontFamily, this.baselineHeight, this._marginW, this._marginH, true, this.fontColor, this.strokeWidth, this.strokeColor, this.strokeOnly, this.fontWeight);
             glyphArea = calcGlyphArea(result.imageData); // NOTE: `needImageData` が true のため必ず真
             glyphArea.advanceWidth = result.advanceWidth;
             this._glyphAreas[code] = glyphArea;
@@ -172,7 +172,7 @@ class NodeCanvasGlyphFactory {
             // サーフェスを生成する。もし前段でcalcGlyphArea()のためのサーフェスを生成して
             // いればここでは生成せずにそれを利用する。
             if (!result) {
-                result = createGlyphRenderedSurface(code, this.fontSize, this._cssFontFamily, this.baselineHeight, this._marginW, this._marginH, false, this.fontColor, this.strokeWidth, this.strokeColor, this.strokeOnly, this.fontWeight);
+                result = createGlyphRenderedSurface(this._canvasFactory, code, this.fontSize, this._cssFontFamily, this.baselineHeight, this._marginW, this._marginH, false, this.fontColor, this.strokeWidth, this.strokeColor, this.strokeOnly, this.fontWeight);
             }
             return new NodeCanvasGlyph_1.NodeCanvasGlyph(code, glyphArea.x, glyphArea.y, (_a = glyphArea.width) !== null && _a !== void 0 ? _a : 0, (_b = glyphArea.height) !== null && _b !== void 0 ? _b : 0, glyphArea.x - this._marginW, glyphArea.y - this._marginH, glyphArea.advanceWidth, result.surface, true);
         }
@@ -181,7 +181,7 @@ class NodeCanvasGlyphFactory {
     measureMinimumFontSize() {
         let fontSize = 1;
         const str = "M";
-        const canvas = new canvas_1.Canvas(50, 50);
+        const canvas = this._canvasFactory.createCanvas(50, 50);
         const context = canvas.getContext("2d");
         if (context == null) {
             throw new Error("cannot get canvas context");

package/lib/runner/v3/platform/graphics/canvas/NodeCanvasImageAsset.d.ts

@@ -1,5 +1,13 @@
 import type { akashicEngine as g } from "../../../engineFiles";
 import { Asset } from "../../assets/Asset";
+import type { NodeCanvasFactory } from "../../NodeCanvasFactory";
+export interface NodeCanvasImageAssetParameters {
+    id: string;
+    path: string;
+    width: number;
+    height: number;
+    canvasFactory: NodeCanvasFactory;
+}
 export declare class NodeCanvasImageAsset extends Asset implements g.ImageAsset {
     type: "image";
     width: number;
@@ -8,7 +16,8 @@ export declare class NodeCanvasImageAsset extends Asset implements g.ImageAsset
     _surface: g.Surface | null;
     private data;
     private dataCache;
-    constructor(id: string, path: string, width: number, height: number);
+    private canvasFactory;
+    constructor(param: NodeCanvasImageAssetParameters);
     destroy(): void;
     _load(loader: g.AssetLoadHandler): void;
     asSurface(): g.Surface;

package/lib/runner/v3/platform/graphics/canvas/NodeCanvasImageAsset.js

@@ -1,18 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NodeCanvasImageAsset = void 0;
-const canvas_1 = require("canvas");
 const Asset_1 = require("../../assets/Asset");
 const NodeCanvasSurface_1 = require("./NodeCanvasSurface");
 class NodeCanvasImageAsset extends Asset_1.Asset {
-    constructor(id, path, width, height) {
-        super(id, path);
+    constructor(param) {
+        super(param.id, param.path);
         this.type = "image";
         this._surface = null;
         this.data = null;
         this.dataCache = null;
-        this.width = width;
-        this.height = height;
+        this.width = param.width;
+        this.height = param.height;
+        this.canvasFactory = param.canvasFactory;
     }
     destroy() {
         if (this._surface && !this._surface.destroyed()) {
@@ -35,7 +35,7 @@ class NodeCanvasImageAsset extends Asset_1.Asset {
             loader._onAssetLoad(this);
         }
         else {
-            const image = new canvas_1.Image();
+            const image = this.canvasFactory.createImage();
             image.onerror = () => {
                 loader._onAssetError(this, {
                     name: "AssetLoadError",
@@ -64,7 +64,7 @@ class NodeCanvasImageAsset extends Asset_1.Asset {
             throw new Error("NodeCanvasImageAsset#asSurface(): not yet loaded.");
         }
         if (this._surface == null) {
-            const canvas = new canvas_1.Canvas(this.width, this.height);
+            const canvas = this.canvasFactory.createCanvas(this.width, this.height);
             const context = canvas.getContext("2d");
             context.drawImage(this.data, 0, 0, this.width, this.height);
             this._surface = new NodeCanvasSurface_1.NodeCanvasSurface(canvas);

package/lib/runner/v3/platform/graphics/canvas/NodeCanvasRenderer.d.ts

@@ -1,7 +1,6 @@
-/** @ts-ignore */
-import type { ImageData } from "canvas";
 import type { akashicEngine as g } from "../../../engineFiles";
 import type { NodeCanvasContext } from "./NodeCanvasContext";
+import type { ImageData } from "./types";
 export declare class NodeCanvasRenderer implements g.Renderer {
     private context;
     private width;

package/lib/runner/v3/platform/graphics/canvas/NodeCanvasSurface.d.ts

@@ -1,7 +1,6 @@
-/** @ts-ignore */
-import type { Canvas } from "canvas";
 import type { akashicEngine as g } from "../../../engineFiles";
 import { NodeCanvasRenderer } from "./NodeCanvasRenderer";
+import type { Canvas } from "./types";
 export declare class NodeCanvasSurface implements g.Surface {
     width: number;
     height: number;

package/lib/runner/v3/platform/graphics/canvas/types.d.ts

@@ -0,0 +1,2 @@
+/** @ts-ignore */
+export type { Canvas, Image, CanvasRenderingContext2D, ImageData, GlobalCompositeOperation } from "canvas";

package/lib/runner/v3/platform/graphics/canvas/types.js

@@ -0,0 +1,3 @@
+"use strict";
+// NOTE: node-canvas ライブラリを利用しない環境で型定義の参照に失敗するケースを回避するため、 `@ts-ignore` で明示的にエラーを無視している
+Object.defineProperty(exports, "__esModule", { value: true });

package/lib/runner/v3/requireEngineFiles.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.requireEngineFiles = void 0;
+exports.requireEngineFiles = requireEngineFiles;
 const fs = require("fs");
 const path = require("path");
 /**
@@ -18,4 +18,3 @@ function requireEngineFiles() {
     }
     return undefined;
 }
-exports.requireEngineFiles = requireEngineFiles;

package/lib/utils.js

@@ -9,13 +9,16 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.resolveUrl = exports.isHttpProtocol = exports.LoadFileInternal = exports.loadFile = void 0;
+exports.LoadFileInternal = void 0;
+exports.loadFile = loadFile;
+exports.isHttpProtocol = isHttpProtocol;
+exports.resolveUrl = resolveUrl;
 const fs = require("fs");
 const node_fetch_1 = require("node-fetch");
 const waitings = [];
 let loadingCount = 0;
-function loadFile(url, encoding = "utf-8") {
-    return __awaiter(this, void 0, void 0, function* () {
+function loadFile(url_1) {
+    return __awaiter(this, arguments, void 0, function* (url, encoding = "utf-8") {
         const promise = new Promise((resolve, reject) => {
             waitings.push({ url, encoding, resolve, reject });
         });
@@ -23,7 +26,6 @@ function loadFile(url, encoding = "utf-8") {
         return promise;
     });
 }
-exports.loadFile = loadFile;
 function processWaitingLoad() {
     return __awaiter(this, void 0, void 0, function* () {
         if (loadingCount >= LoadFileInternal.MAX_PARALLEL_LOAD || waitings.length === 0)
@@ -54,8 +56,8 @@ var LoadFileInternal;
      * 具体的な値は調整の余地がある。少なくとも Windows 環境で、128 以上で問題が起きることがわかっている。
      */
     LoadFileInternal.MAX_PARALLEL_LOAD = 32;
-    function loadImpl(url, encoding = "utf-8") {
-        return __awaiter(this, void 0, void 0, function* () {
+    function loadImpl(url_1) {
+        return __awaiter(this, arguments, void 0, function* (url, encoding = "utf-8") {
             if (isHttpProtocol(url)) {
                 const res = yield (0, node_fetch_1.default)(url, { method: "GET" });
                 if (encoding === "utf-8") {
@@ -86,7 +88,6 @@ var LoadFileInternal;
 function isHttpProtocol(url) {
     return /^(http|https)\:\/\//.test(url);
 }
-exports.isHttpProtocol = isHttpProtocol;
 // @see https://nodejs.org/api/url.html#urlresolvefrom-to
 function resolveUrl(from, to) {
     const resolvedUrl = new URL(to, new URL(from, "resolve://"));
@@ -97,4 +98,3 @@ function resolveUrl(from, to) {
     }
     return resolvedUrl.toString();
 }
-exports.resolveUrl = resolveUrl;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@akashic/headless-driver",
-  "version": "2.15.11",
+  "version": "2.16.0",
   "description": "A library to execute contents using Akashic Engine headlessly",
   "main": "lib/index.js",
   "author": "DWANGO Co., Ltd.",
@@ -29,7 +29,7 @@
     "@akashic/trigger": "^2.0.0",
     "engine-files-v1": "npm:@akashic/engine-files@1.4.0",
     "engine-files-v2": "npm:@akashic/engine-files@2.4.0",
-    "engine-files-v3": "npm:@akashic/engine-files@3.10.1",
+    "engine-files-v3": "npm:@akashic/engine-files@3.11.0",
     "js-sha256": "^0.11.0",
     "lodash.clonedeep": "^4.5.0",
     "node-fetch": "^2.6.7"
@@ -37,6 +37,7 @@
   "devDependencies": {
     "@akashic/eslint-config": "^2.0.0",
     "@akashic/remark-preset-lint": "^0.1.2",
+    "@napi-rs/canvas": "^0.1.66",
     "@types/jest": "^29.1.1",
     "@types/lodash.clonedeep": "^4.5.7",
     "@types/node": "^18.7.23",
@@ -44,7 +45,7 @@
     "@types/pixelmatch": "^5.2.4",
     "@types/pngjs": "^6.0.1",
     "@typescript-eslint/eslint-plugin": "^6.12.0",
-    "canvas": "^2.11.2",
+    "canvas": "^3.1.0",
     "eslint": "^8.54.0",
     "eslint-config-prettier": "^9.0.0",
     "eslint-plugin-import": "^2.29.0",
@@ -59,8 +60,8 @@
     "remark-cli": "^12.0.0",
     "rimraf": "^6.0.0",
     "serve-handler": "^6.1.3",
-    "ts-jest": "^29.0.3",
-    "typescript": "^5.0.0"
+    "ts-jest": "^29.2.5",
+    "typescript": "^5.7.3"
   },
   "jest": {
     "moduleFileExtensions": [