Skip to content

Commit e03ff22

Browse files
d98762625d98762625
committed
update more ENVIRONMENT_IS_* calls after merge, update some test paths, comments. Remove vulnerability
1 parent 368f508 commit e03ff22

File tree

10 files changed

+31
-19
lines changed

10 files changed

+31
-19
lines changed

‎package-lock.json

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/core/Recipe.mjs

+2-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import OperationError from "./errors/OperationError";
99
import Operation from "./Operation";
1010
import DishError from "./errors/DishError";
1111
import log from "loglevel";
12+
import { isWorkerEnvironment } from "./Utils";
1213

1314
// Cache container for modules
1415
let modules = null;
@@ -202,7 +203,7 @@ class Recipe {
202203
input = await dish.get(op.inputType);
203204
log.debug(`Executing operation '${op.name}'`);
204205

205-
if (ENVIRONMENT_IS_WORKER()) {
206+
if (isWorkerEnvironment()) {
206207
self.sendStatusMessage(`Baking... (${i+1}/${this.opList.length})`);
207208
self.sendProgressMessage(i + 1, this.opList.length);
208209
}

‎src/core/Utils.mjs

+9-2
Original file line numberDiff line numberDiff line change
@@ -1154,17 +1154,24 @@ class Utils {
11541154

11551155
/**
11561156
* Check whether the code is running in a Node.js environment
1157+
* @returns {boolean}
11571158
*/
11581159
export function isNodeEnvironment() {
11591160
return typeof process !== "undefined" && process.versions != null && process.versions.node != null;
11601161
}
11611162

1162-
/** */
1163+
/**
1164+
* Check whether the code is running in a web environment
1165+
* @returns {boolean}
1166+
*/
11631167
export function isWebEnvironment() {
11641168
return typeof window === "object";
11651169
}
11661170

1167-
/** */
1171+
/**
1172+
* Check whether the code is running in a worker
1173+
* @returns {boolean}
1174+
*/
11681175
export function isWorkerEnvironment() {
11691176
return typeof importScripts === "function";
11701177
}

‎src/core/operations/AddTextToImage.mjs

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import Operation from "../Operation";
88
import OperationError from "../errors/OperationError";
99
import { isImage } from "../lib/FileType";
1010
import { toBase64 } from "../lib/Base64";
11+
import { isWorkerEnvironment } from "../Utils";
1112
import jimp from "jimp";
1213

1314
/**
@@ -131,7 +132,7 @@ class AddTextToImage extends Operation {
131132
throw new OperationError(`Error loading image. (${err})`);
132133
}
133134
try {
134-
if (ENVIRONMENT_IS_WORKER())
135+
if (isWorkerEnvironment())
135136
self.sendStatusMessage("Adding text to image...");
136137

137138
const fontsMap = {};

‎src/core/operations/Bzip2Compress.mjs

+3-2
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import Operation from "../Operation";
88
import OperationError from "../errors/OperationError";
99
import Bzip2 from "libbzip2-wasm";
10+
import { isWorkerEnvironment } from "../Utils";
1011

1112
/**
1213
* Bzip2 Compress operation
@@ -51,10 +52,10 @@ class Bzip2Compress extends Operation {
5152
if (input.byteLength <= 0) {
5253
throw new OperationError("Please provide an input.");
5354
}
54-
if (ENVIRONMENT_IS_WORKER()) self.sendStatusMessage("Loading Bzip2...");
55+
if (isWorkerEnvironment()) self.sendStatusMessage("Loading Bzip2...");
5556
return new Promise((resolve, reject) => {
5657
Bzip2().then(bzip2 => {
57-
if (ENVIRONMENT_IS_WORKER()) self.sendStatusMessage("Compressing data...");
58+
if (isWorkerEnvironment()) self.sendStatusMessage("Compressing data...");
5859
const inpArray = new Uint8Array(input);
5960
const bzip2cc = bzip2.compressBZ2(inpArray, blockSize, workFactor);
6061
if (bzip2cc.error !== 0) {

‎src/core/operations/Bzip2Decompress.mjs

+3-2
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import Operation from "../Operation";
88
import OperationError from "../errors/OperationError";
99
import Bzip2 from "libbzip2-wasm";
10+
import { isWorkerEnvironment } from "../Utils";
1011

1112
/**
1213
* Bzip2 Decompress operation
@@ -51,10 +52,10 @@ class Bzip2Decompress extends Operation {
5152
if (input.byteLength <= 0) {
5253
throw new OperationError("Please provide an input.");
5354
}
54-
if (ENVIRONMENT_IS_WORKER()) self.sendStatusMessage("Loading Bzip2...");
55+
if (isWorkerEnvironment()) self.sendStatusMessage("Loading Bzip2...");
5556
return new Promise((resolve, reject) => {
5657
Bzip2().then(bzip2 => {
57-
if (ENVIRONMENT_IS_WORKER()) self.sendStatusMessage("Decompressing data...");
58+
if (isWorkerEnvironment()) self.sendStatusMessage("Decompressing data...");
5859
const inpArray = new Uint8Array(input);
5960
const bzip2cc = bzip2.decompressBZ2(inpArray, small ? 1 : 0);
6061
if (bzip2cc.error !== 0) {

‎src/core/operations/SharpenImage.mjs

+5-4
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import OperationError from "../errors/OperationError";
99
import { isImage } from "../lib/FileType";
1010
import { toBase64 } from "../lib/Base64";
1111
import { gaussianBlur } from "../lib/ImageManipulation";
12+
import { isWorkerEnvironment } from "../Utils";
1213
import jimp from "jimp";
1314

1415
/**
@@ -73,16 +74,16 @@ class SharpenImage extends Operation {
7374
}
7475

7576
try {
76-
if (ENVIRONMENT_IS_WORKER())
77+
if (isWorkerEnvironment())
7778
self.sendStatusMessage("Sharpening image... (Cloning image)");
7879
const blurMask = image.clone();
7980

80-
if (ENVIRONMENT_IS_WORKER())
81+
if (isWorkerEnvironment())
8182
self.sendStatusMessage("Sharpening image... (Blurring cloned image)");
8283
const blurImage = gaussianBlur(image.clone(), radius, 3);
8384

8485

85-
if (ENVIRONMENT_IS_WORKER())
86+
if (isWorkerEnvironment())
8687
self.sendStatusMessage("Sharpening image... (Creating unsharp mask)");
8788
blurMask.scan(0, 0, blurMask.bitmap.width, blurMask.bitmap.height, function(x, y, idx) {
8889
const blurRed = blurImage.bitmap.data[idx];
@@ -99,7 +100,7 @@ class SharpenImage extends Operation {
99100
this.bitmap.data[idx + 2] = (normalBlue > blurBlue) ? normalBlue - blurBlue : 0;
100101
});
101102

102-
if (ENVIRONMENT_IS_WORKER())
103+
if (isWorkerEnvironment())
103104
self.sendStatusMessage("Sharpening image... (Merging with unsharp mask)");
104105
image.scan(0, 0, image.bitmap.width, image.bitmap.height, function(x, y, idx) {
105106
let maskRed = blurMask.bitmap.data[idx];

‎tests/node/tests/operations.mjs

+2-2
Original file line numberDiff line numberDiff line change
@@ -215,8 +215,8 @@ Full hash: $2a$10$ODeP1.6fMsb.ENk2ngPUCO7qTGVPyHA9TqDVcyupyed8FjsiF65L6`;
215215
}`);
216216
}),
217217

218-
it("Bzip2 Decompress", () => {
219-
const result = chef.bzip2Decompress(chef.fromBase64("QlpoOTFBWSZTWUdQlt0AAAIVgEAAAQAmJAwAIAAxBkxA0A2pTL6U2CozxdyRThQkEdQlt0A="));
218+
it("Bzip2 Decompress", async () => {
219+
const result = await chef.bzip2Decompress(chef.fromBase64("QlpoOTFBWSZTWUdQlt0AAAIVgEAAAQAmJAwAIAAxBkxA0A2pTL6U2CozxdyRThQkEdQlt0A="));
220220
assert.strictEqual(result.toString(), "Fit as a Fiddle");
221221
}),
222222

‎tests/operations/tests/IndexOfCoincidence.mjs

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* @copyright Crown Copyright 2019
66
* @license Apache-2.0
77
*/
8-
import TestRegister from "../TestRegister";
8+
import TestRegister from "../../lib/TestRegister";
99

1010
TestRegister.addTests([
1111
{

‎tests/operations/tests/JSONtoCSV.mjs

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* @copyright Crown Copyright 2019
77
* @license Apache-2.0
88
*/
9-
import TestRegister from "../TestRegister";
9+
import TestRegister from "../../lib/TestRegister";
1010

1111
const EXPECTED_CSV_SINGLE = "a,b,c\r\n1,2,3\r\n";
1212
const EXPECTED_CSV_MULTIPLE = "a,b,c\r\n1,2,3\r\n1,2,3\r\n";

0 commit comments

Comments
 (0)