mirror of https://github.com/xwiki-labs/cryptpad
Implementing Spreadsheet XLSX import/export using WebAssembly
This commit is contained in:
Ludovic Dubost
parent
89d9f22e0e
commit
7026123bfc
|
|
@ -67,7 +67,11 @@ define([
|
|||
var file = e.target.files[0];
|
||||
var reader = new FileReader();
|
||||
reader.onload = function (e) { f(e.target.result, file); };
|
||||
reader.readAsText(file, type);
|
||||
if (cfg && cfg.binary) {
|
||||
reader.readAsArrayBuffer(file, type);
|
||||
} else {
|
||||
reader.readAsText(file, type);
|
||||
}
|
||||
});
|
||||
};
|
||||
};
|
||||
|
|
@ -1853,9 +1857,9 @@ define([
|
|||
// Old import button, used in settings
|
||||
button
|
||||
.click(common.prepareFeedback(type))
|
||||
.click(importContent('text/plain', function (content, file) {
|
||||
.click(importContent((data && data.binary) ? 'application/octet-stream' : 'text/plain', function (content, file) {
|
||||
callback(content, file);
|
||||
}, {accept: data ? data.accept : undefined}));
|
||||
}, {accept: data ? data.accept : undefined, binary: data ? data.binary : undefined }));
|
||||
//}
|
||||
break;
|
||||
case 'upload':
|
||||
|
|
|
|||
|
|
@ -730,6 +730,100 @@ define([
|
|||
});
|
||||
};
|
||||
|
||||
var x2tInitialized = false;
|
||||
var x2tInit = function(x2t) {
|
||||
console.log("x2t mount");
|
||||
// x2t.FS.mount(x2t.MEMFS, {} , '/');
|
||||
x2t.FS.mkdir('/working');
|
||||
console.log("x2t mount done");
|
||||
}
|
||||
|
||||
/*
|
||||
Converting Data
|
||||
|
||||
This function converts a data in a specific format to the outputformat
|
||||
The filename extension needs to represent the input format
|
||||
Example: fileName=cryptpad.bin outputFormat=xlsx
|
||||
*/
|
||||
var x2tConvertDataInternal = function(x2t, data, fileName, outputFormat) {
|
||||
console.log("Converting Data for " + fileName + " to " + outputFormat);
|
||||
// writing file to mounted working disk (in memory)
|
||||
x2t.FS.writeFile('/working/' + fileName, data);
|
||||
var params = "<?xml version=\"1.0\" encoding=\"utf-8\"?>"
|
||||
+ "<TaskQueueDataConvert xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\">"
|
||||
+ "<m_sFileFrom>/working/" + fileName + "</m_sFileFrom>"
|
||||
+ "<m_sFileTo>/working/" + fileName + "." + outputFormat + "</m_sFileTo>"
|
||||
+ "<m_bIsNoBase64>false</m_bIsNoBase64>"
|
||||
+ "</TaskQueueDataConvert>"
|
||||
// writing params file to mounted working disk (in memory)
|
||||
x2t.FS.writeFile('/working/params.xml', params);
|
||||
// running conversion
|
||||
x2t.ccall("runX2T", ["number"], ["string"], ["/working/params.xml"]);
|
||||
// reading output file from working disk (in memory)
|
||||
var result = x2t.FS.readFile('/working/' + fileName + "." + outputFormat);
|
||||
return result;
|
||||
}
|
||||
|
||||
var x2tSaveAndConvertDataInternal = function(x2t, data, filename, extension, finalFilename) {
|
||||
var xlsData = x2tConvertDataInternal(x2t, data, filename, extension);
|
||||
var blob = new Blob([xlsData], {type: "application/bin;charset=utf-8"});
|
||||
saveAs(blob, finalFilename);
|
||||
}
|
||||
|
||||
var x2tSaveAndConvertData = function(data, filename, extension, finalFilename) {
|
||||
// Perform the x2t conversion
|
||||
require(['/common/onlyoffice/x2t/x2t.js'], function() {
|
||||
var x2t = Module;
|
||||
x2t.run();
|
||||
if (x2tInitialized) {
|
||||
console.log("x2t runtime already initialized");
|
||||
x2tSaveAndConvertDataInternal(x2t, data, filename, extension, finalFilename);
|
||||
}
|
||||
|
||||
x2t.onRuntimeInitialized = function() {
|
||||
console.log("x2t in runtime initialized");
|
||||
// Init x2t js module
|
||||
x2tInit(x2t);
|
||||
x2tInitialized = true;
|
||||
x2tSaveAndConvertDataInternal(x2t, data, filename, extension, finalFilename);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
var exportXLSXFile = function() {
|
||||
var text = getContent();
|
||||
var suggestion = Title.suggestTitle(Title.defaultTitle);
|
||||
UI.prompt(Messages.exportPrompt,
|
||||
Util.fixFileName(suggestion) + '.xlsx', function (filename) {
|
||||
if (!(typeof(filename) === 'string' && filename)) { return; }
|
||||
x2tSaveAndConvertData(text, "filename.bin", "xlsx", filename);
|
||||
});
|
||||
};
|
||||
|
||||
var importXLSXFile = function(content, filename) {
|
||||
var file = getFileType();
|
||||
// Perform the x2t conversion
|
||||
require(['/common/onlyoffice/x2t/x2t.js'], function() {
|
||||
var x2t = Module;
|
||||
x2t.run();
|
||||
if (x2tInitialized) {
|
||||
console.log("x2t runtime already initialized");
|
||||
var convertedContent = x2tConvertDataInternal(x2t, new Uint8Array(content), file.title, "bin");
|
||||
importFile(convertedContent);
|
||||
}
|
||||
|
||||
x2t.onRuntimeInitialized = function() {
|
||||
console.log("x2t in runtime initialized");
|
||||
// Init x2t js module
|
||||
x2tInit(x2t);
|
||||
x2tInitialized = true;
|
||||
var convertedContent = x2tConvertDataInternal(x2t, new Uint8Array(content), file.title, "bin");
|
||||
importFile(convertedContent);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
var importFile = function(content) {
|
||||
// Abort if there is another real user in the channel (history keeper excluded)
|
||||
var m = metadataMgr.getChannelMembers().slice().filter(function (nId) {
|
||||
|
|
@ -912,9 +1006,15 @@ define([
|
|||
var $export = common.createButton('export', true, {}, exportFile);
|
||||
$export.appendTo($rightside);
|
||||
|
||||
var $exportXLSX = common.createButton('export', true, {}, exportXLSXFile);
|
||||
$exportXLSX.appendTo($rightside);
|
||||
|
||||
var $import = common.createButton('import', true, {}, importFile);
|
||||
$import.appendTo($rightside);
|
||||
|
||||
var $importXLSX = common.createButton('import', true, { accept: ["xlsx"], types: ["xlsx"], binary : true }, importXLSXFile);
|
||||
$importXLSX.appendTo($rightside);
|
||||
|
||||
if (common.isLoggedIn()) {
|
||||
common.createButton('hashtag', true).appendTo($rightside);
|
||||
}
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
Binary file not shown.
|
|
@ -0,0 +1,211 @@
|
|||
// Copyright 2015 The Emscripten Authors. All rights reserved.
|
||||
// Emscripten is available under two separate licenses, the MIT license and the
|
||||
// University of Illinois/NCSA Open Source License. Both these licenses can be
|
||||
// found in the LICENSE file.
|
||||
|
||||
// Pthread Web Worker startup routine:
|
||||
// This is the entry point file that is loaded first by each Web Worker
|
||||
// that executes pthreads on the Emscripten application.
|
||||
|
||||
// Thread-local:
|
||||
var threadInfoStruct = 0; // Info area for this thread in Emscripten HEAP (shared). If zero, this worker is not currently hosting an executing pthread.
|
||||
var selfThreadId = 0; // The ID of this thread. 0 if not hosting a pthread.
|
||||
var parentThreadId = 0; // The ID of the parent pthread that launched this thread.
|
||||
|
||||
var noExitRuntime;
|
||||
|
||||
// performance.now() is specced to return a wallclock time in msecs since that Web Worker/main thread launched. However for pthreads this can cause
|
||||
// subtle problems in emscripten_get_now() as this essentially would measure time from pthread_create(), meaning that the clocks between each threads
|
||||
// would be wildly out of sync. Therefore sync all pthreads to the clock on the main browser thread, so that different threads see a somewhat
|
||||
// coherent clock across each of them (+/- 0.1msecs in testing)
|
||||
var __performance_now_clock_drift = 0;
|
||||
|
||||
// Cannot use console.log or console.error in a web worker, since that would risk a browser deadlock! https://bugzilla.mozilla.org/show_bug.cgi?id=1049091
|
||||
// Therefore implement custom logging facility for threads running in a worker, which queue the messages to main thread to print.
|
||||
var Module = {};
|
||||
|
||||
// These modes need to assign to these variables because of how scoping works in them.
|
||||
|
||||
|
||||
function threadPrintErr() {
|
||||
var text = Array.prototype.slice.call(arguments).join(' ');
|
||||
console.error(text);
|
||||
console.error(new Error().stack);
|
||||
}
|
||||
function threadAlert() {
|
||||
var text = Array.prototype.slice.call(arguments).join(' ');
|
||||
postMessage({cmd: 'alert', text: text, threadId: selfThreadId});
|
||||
}
|
||||
var err = threadPrintErr;
|
||||
this.alert = threadAlert;
|
||||
|
||||
// When using postMessage to send an object, it is processed by the structured clone algorithm.
|
||||
// The prototype, and hence methods, on that object is then lost. This function adds back the lost prototype.
|
||||
// This does not work with nested objects that has prototypes, but it suffices for WasmSourceMap and WasmOffsetConverter.
|
||||
function resetPrototype(constructor, attrs) {
|
||||
var object = Object.create(constructor.prototype);
|
||||
for (var key in attrs) {
|
||||
if (attrs.hasOwnProperty(key)) {
|
||||
object[key] = attrs[key];
|
||||
}
|
||||
}
|
||||
return object;
|
||||
}
|
||||
|
||||
Module['instantiateWasm'] = function(info, receiveInstance) {
|
||||
// Instantiate from the module posted from the main thread.
|
||||
// We can just use sync instantiation in the worker.
|
||||
var instance = new WebAssembly.Instance(Module['wasmModule'], info);
|
||||
// We don't need the module anymore; new threads will be spawned from the main thread.
|
||||
Module['wasmModule'] = null;
|
||||
receiveInstance(instance); // The second 'module' parameter is intentionally null here, we don't need to keep a ref to the Module object from here.
|
||||
return instance.exports;
|
||||
};
|
||||
|
||||
|
||||
this.onmessage = function(e) {
|
||||
try {
|
||||
if (e.data.cmd === 'load') { // Preload command that is called once per worker to parse and load the Emscripten code.
|
||||
|
||||
// Initialize the global "process"-wide fields:
|
||||
Module['DYNAMIC_BASE'] = e.data.DYNAMIC_BASE;
|
||||
Module['DYNAMICTOP_PTR'] = e.data.DYNAMICTOP_PTR;
|
||||
|
||||
// Module and memory were sent from main thread
|
||||
Module['wasmModule'] = e.data.wasmModule;
|
||||
Module['wasmMemory'] = e.data.wasmMemory;
|
||||
Module['buffer'] = Module['wasmMemory'].buffer;
|
||||
|
||||
Module['ENVIRONMENT_IS_PTHREAD'] = true;
|
||||
|
||||
if (typeof e.data.urlOrBlob === 'string') {
|
||||
importScripts(e.data.urlOrBlob);
|
||||
} else {
|
||||
var objectUrl = URL.createObjectURL(e.data.urlOrBlob);
|
||||
importScripts(objectUrl);
|
||||
URL.revokeObjectURL(objectUrl);
|
||||
}
|
||||
PThread = Module['PThread'];
|
||||
HEAPU32 = Module['HEAPU32'];
|
||||
|
||||
if (typeof FS !== 'undefined' && typeof FS.createStandardStreams === 'function') FS.createStandardStreams();
|
||||
postMessage({ cmd: 'loaded' });
|
||||
} else if (e.data.cmd === 'objectTransfer') {
|
||||
PThread.receiveObjectTransfer(e.data);
|
||||
} else if (e.data.cmd === 'run') { // This worker was idle, and now should start executing its pthread entry point.
|
||||
__performance_now_clock_drift = performance.now() - e.data.time; // Sync up to the clock of the main thread.
|
||||
threadInfoStruct = e.data.threadInfoStruct;
|
||||
Module['__register_pthread_ptr'](threadInfoStruct, /*isMainBrowserThread=*/0, /*isMainRuntimeThread=*/0); // Pass the thread address inside the asm.js scope to store it for fast access that avoids the need for a FFI out.
|
||||
selfThreadId = e.data.selfThreadId;
|
||||
parentThreadId = e.data.parentThreadId;
|
||||
// Establish the stack frame for this thread in global scope
|
||||
// The stack grows downwards
|
||||
var max = e.data.stackBase;
|
||||
var top = e.data.stackBase + e.data.stackSize;
|
||||
Module['applyStackValues'](top, top, max);
|
||||
// Call inside asm.js/wasm module to set up the stack frame for this pthread in asm.js/wasm module scope
|
||||
Module['establishStackSpace'](e.data.stackBase, e.data.stackBase + e.data.stackSize);
|
||||
Module['_emscripten_tls_init']();
|
||||
|
||||
PThread.receiveObjectTransfer(e.data);
|
||||
PThread.setThreadStatus(Module['_pthread_self'](), 1/*EM_THREAD_STATUS_RUNNING*/);
|
||||
|
||||
try {
|
||||
// pthread entry points are always of signature 'void *ThreadMain(void *arg)'
|
||||
// Native codebases sometimes spawn threads with other thread entry point signatures,
|
||||
// such as void ThreadMain(void *arg), void *ThreadMain(), or void ThreadMain().
|
||||
// That is not acceptable per C/C++ specification, but x86 compiler ABI extensions
|
||||
// enable that to work. If you find the following line to crash, either change the signature
|
||||
// to "proper" void *ThreadMain(void *arg) form, or try linking with the Emscripten linker
|
||||
// flag -s EMULATE_FUNCTION_POINTER_CASTS=1 to add in emulation for this x86 ABI extension.
|
||||
var result = Module['dynCall_ii'](e.data.start_routine, e.data.arg);
|
||||
|
||||
|
||||
} catch(e) {
|
||||
if (e === 'Canceled!') {
|
||||
PThread.threadCancel();
|
||||
return;
|
||||
} else if (e === 'SimulateInfiniteLoop' || e === 'pthread_exit') {
|
||||
return;
|
||||
} else {
|
||||
Atomics.store(HEAPU32, (threadInfoStruct + 4 /*C_STRUCTS.pthread.threadExitCode*/ ) >> 2, (e instanceof Module['ExitStatus']) ? e.status : -2 /*A custom entry specific to Emscripten denoting that the thread crashed.*/);
|
||||
Atomics.store(HEAPU32, (threadInfoStruct + 0 /*C_STRUCTS.pthread.threadStatus*/ ) >> 2, 1); // Mark the thread as no longer running.
|
||||
Module['_emscripten_futex_wake'](threadInfoStruct + 0 /*C_STRUCTS.pthread.threadStatus*/, 0x7FFFFFFF/*INT_MAX*/); // Wake all threads waiting on this thread to finish.
|
||||
if (!(e instanceof Module['ExitStatus'])) throw e;
|
||||
}
|
||||
}
|
||||
// The thread might have finished without calling pthread_exit(). If so, then perform the exit operation ourselves.
|
||||
// (This is a no-op if explicit pthread_exit() had been called prior.)
|
||||
if (!noExitRuntime) PThread.threadExit(result);
|
||||
} else if (e.data.cmd === 'cancel') { // Main thread is asking for a pthread_cancel() on this thread.
|
||||
if (threadInfoStruct) {
|
||||
PThread.threadCancel();
|
||||
}
|
||||
} else if (e.data.target === 'setimmediate') {
|
||||
// no-op
|
||||
} else if (e.data.cmd === 'processThreadQueue') {
|
||||
if (threadInfoStruct) { // If this thread is actually running?
|
||||
Module['_emscripten_current_thread_process_queued_calls']();
|
||||
}
|
||||
} else {
|
||||
err('worker.js received unknown command ' + e.data.cmd);
|
||||
console.error(e.data);
|
||||
}
|
||||
} catch(e) {
|
||||
console.error('worker.js onmessage() captured an uncaught exception: ' + e);
|
||||
console.error(e.stack);
|
||||
throw e;
|
||||
}
|
||||
};
|
||||
|
||||
// Node.js support
|
||||
if (typeof process === 'object' && typeof process.versions === 'object' && typeof process.versions.node === 'string') {
|
||||
// Create as web-worker-like an environment as we can.
|
||||
self = {
|
||||
location: {
|
||||
href: __filename
|
||||
}
|
||||
};
|
||||
|
||||
var onmessage = this.onmessage;
|
||||
|
||||
var nodeWorkerThreads = require('worker_threads');
|
||||
|
||||
Worker = nodeWorkerThreads.Worker;
|
||||
|
||||
var parentPort = nodeWorkerThreads.parentPort;
|
||||
|
||||
parentPort.on('message', function(data) {
|
||||
onmessage({ data: data });
|
||||
});
|
||||
|
||||
var nodeFS = require('fs');
|
||||
|
||||
var nodeRead = function(filename) {
|
||||
return nodeFS.readFileSync(filename, 'utf8');
|
||||
};
|
||||
|
||||
function globalEval(x) {
|
||||
global.require = require;
|
||||
global.Module = Module;
|
||||
eval.call(null, x);
|
||||
}
|
||||
|
||||
importScripts = function(f) {
|
||||
globalEval(nodeRead(f));
|
||||
};
|
||||
|
||||
postMessage = function(msg) {
|
||||
parentPort.postMessage(msg);
|
||||
};
|
||||
|
||||
if (typeof performance === 'undefined') {
|
||||
performance = {
|
||||
now: function() {
|
||||
return Date.now();
|
||||
}
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Loading…
Reference in New Issue