Add logging feature

This commit is contained in:
Jerome Wu 2019-10-30 17:57:55 +08:00
parent 1e558c3a36
commit d3635e73bf
3 changed files with 14 additions and 2 deletions

View File

@ -4,7 +4,9 @@ const { createWorker } = require('../../src');
const { argv } = process; const { argv } = process;
const [,, inputPath, outputPath] = argv; const [,, inputPath, outputPath] = argv;
const worker = createWorker(); const worker = createWorker({
logger: ({ message }) => console.log(message),
});
(async () => { (async () => {
await worker.load(); await worker.load();

View File

@ -1,6 +1,9 @@
require('regenerator-runtime/runtime'); require('regenerator-runtime/runtime');
const { logging, setLogging } = require('./utils/log');
const createWorker = require('./createWorker'); const createWorker = require('./createWorker');
module.exports = { module.exports = {
logging,
setLogging,
createWorker, createWorker,
}; };

View File

@ -1,6 +1,7 @@
require('regenerator-runtime/runtime'); require('regenerator-runtime/runtime');
const defaultArgs = require('./constants/defaultArgs'); const defaultArgs = require('./constants/defaultArgs');
let action = 'unknown';
let Module = null; let Module = null;
let adapter = null; let adapter = null;
let ffmpeg = null; let ffmpeg = null;
@ -25,12 +26,16 @@ const strList2ptr = (strList) => {
return listPtr; return listPtr;
}; };
const load = ({ payload: { options: { corePath } } }, res) => { const load = ({ workerId, payload: { options: { corePath } } }, res) => {
if (Module == null) { if (Module == null) {
const Core = adapter.getCore(corePath); const Core = adapter.getCore(corePath);
Core() Core()
.then((_Module) => { .then((_Module) => {
Module = _Module; Module = _Module;
console.log(JSON.stringify(Object.keys(Module)));
Module.setLogger((message, type) => {
res.progress({ workerId, action, type, message });
});
ffmpeg = Module.cwrap('ffmpeg', 'number', ['number', 'number']); ffmpeg = Module.cwrap('ffmpeg', 'number', ['number', 'number']);
res.resolve(true); res.resolve(true);
}); });
@ -70,6 +75,7 @@ exports.dispatchHandlers = (packet, send) => {
res.reject = res.bind(this, 'reject'); res.reject = res.bind(this, 'reject');
res.progress = res.bind(this, 'progress'); res.progress = res.bind(this, 'progress');
action = packet.action
try { try {
({ ({
load, load,
@ -79,6 +85,7 @@ exports.dispatchHandlers = (packet, send) => {
/** Prepare exception to travel through postMessage */ /** Prepare exception to travel through postMessage */
res.reject(err.toString()); res.reject(err.toString());
} }
action = 'unknown';
}; };
exports.setAdapter = (_adapter) => { exports.setAdapter = (_adapter) => {