Merge pull request #124 from PrismarineJS/karang_fix

Safe require optional package
PrismarineJS · Jan 23, 2021 · 8f13f8d · 8f13f8d
2 parents 3f30f85 + 4635c4c
commit 8f13f8d
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 5 deletions.
diff --git a/lib/headless.js b/lib/headless.js
@@ -1,10 +1,16 @@
 /* global THREE */
-
+function safeRequire (path) {
+  try {
+    return require(path)
+  } catch (e) {
+    return {}
+  }
+}
 const { spawn } = require('child_process')
 const net = require('net')
 global.THREE = require('three')
 global.Worker = require('worker_threads').Worker
-const { createCanvas } = require('node-canvas-webgl/lib')
+const { createCanvas } = safeRequire('node-canvas-webgl/lib')
 
 const { WorldView, Viewer, getBufferFromStream } = require('../viewer')
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "prismarine-viewer",
-  "version": "1.13.2",
+  "version": "1.13.3",
   "description": "Web based viewer",
   "main": "index.js",
   "scripts": {

diff --git a/viewer/lib/utils.js b/viewer/lib/utils.js
@@ -1,5 +1,11 @@
-
-const { loadImage } = require('node-canvas-webgl/lib')
+function safeRequire (path) {
+  try {
+    return require(path)
+  } catch (e) {
+    return {}
+  }
+}
+const { loadImage } = safeRequire('node-canvas-webgl/lib')
 const THREE = require('three')
 const path = require('path')