Cool_Tools/CyberChef
1
0
Fork 0
mirror of synced 2025-02-20 20:21:24 +01:00
Code Releases Activity

incorporate ArrayBuffer base Dish type. Add global file shim to node index. Fix Buffer -> ArrayBuffer transformation

Browse Source
This commit is contained in:
d98762625 2019-04-04 16:29:34 +01:00
parent e4ee0fc397
commit af504891e4
6 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/Dish.mjs
View File

@ -387,7 +387,7 @@ class Dish {
[Dish.BIG_NUMBER]: () => Promise.resolve(DishBigNumber.toArrayBuffer.bind(this)()),
[Dish.JSON]: () => Promise.resolve(DishJSON.toArrayBuffer.bind(this)()),
[Dish.FILE]: () => DishFile.toArrayBuffer.bind(this)(),
[Dish.LIST_FILE]: () => DishListFile.toArrayBuffer.bind(this)(),
[Dish.LIST_FILE]: () => Promise.resolve(DishListFile.toArrayBuffer.bind(this)()),
[Dish.BYTE_ARRAY]: () => Promise.resolve(DishByteArray.toArrayBuffer.bind(this)()),
},
node: {

8
src/core/Utils.mjs
View File

@ -94,7 +94,7 @@ class Utils {
const paddedBytes = new Array(numBytes);
paddedBytes.fill(padByte);
Array.prototype.map.call(arr, function(b, i) {
[...arr].forEach((b, i) => {
paddedBytes[i] = b;
});
@ -1033,8 +1033,10 @@ class Utils {
if (!Utils.isNode()) {
throw new TypeError("Browser environment cannot support readFileSync");
}
return file.data.buffer;
// Resist using node's Buffer.buffer here - this yields a 8192 length byteArray
// regardless of the length of the buffer.
const arrayBuffer = Uint8Array.from(file.data);
return arrayBuffer.buffer;
}

9
src/core/dishTranslationTypes/DishListFile.mjs
View File

@ -17,14 +17,7 @@ class DishListFile extends DishTranslationType {
*/
static toArrayBuffer() {
DishListFile.checkForValue(this.value);
if (Utils.isNode()) {
// TODO
this.value = [].concat.apply([], this.value.map(f => Utils.readFileSync(f)).map(b => Array.prototype.slice.call(b)));
} else {
return new Promise((resolve, reject) => {
resolve(DishListFile.concatenateTypedArrays(...this.value).buffer);
});
}
this.value = DishListFile.concatenateTypedArrays(...this.value).buffer;
}
/**

3
src/node/config/scripts/generateNodeIndex.mjs
View File

@ -41,6 +41,7 @@ let code = `/**
import "babel-polyfill";
import NodeDish from "./NodeDish";
import { _wrap, help, bake, _explainExludedFunction } from "./api";
import File from "./File";
import {
// import as core_ to avoid name clashes after wrap.
`;
@ -53,6 +54,8 @@ includedOperations.forEach((op) => {
code +=`
} from "../core/operations/index";
global.File = File;
// Define global environment functions
global.ENVIRONMENT_IS_WORKER = function() {
return typeof importScripts === "function";

3
src/node/index.mjs
View File

@ -12,6 +12,7 @@
import "babel-polyfill";
import NodeDish from "./NodeDish";
import { _wrap, help, bake, _explainExludedFunction } from "./api";
import File from "./File";
import {
// import as core_ to avoid name clashes after wrap.
A1Z26CipherDecode as core_A1Z26CipherDecode,
@ -316,6 +317,8 @@ import {
} from "../core/operations/index";
global.File = File;
// Define global environment functions
global.ENVIRONMENT_IS_WORKER = function() {
return typeof importScripts === "function";

5
tests/lib/utils.mjs
View File

@ -79,11 +79,6 @@ export function logTestReport(testStatus, results) {
}
}
if (!testStatus.allTestsPassing) {
console.log("\nFailing tests:\n");
results.filter(r => r.status !== "passing").forEach(handleTestResult);
}
process.exit(testStatus.allTestsPassing ? 0 : 1);
}