From d3635e73bfe889902474749c5d630c8ebed64979 Mon Sep 17 00:00:00 2001 From: Jerome Wu Date: Wed, 30 Oct 2019 17:57:55 +0800 Subject: [PATCH] Add logging feature --- examples/node/transcode.js | 4 +++- src/index.js | 3 +++ src/worker-script/index.js | 9 ++++++++- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/examples/node/transcode.js b/examples/node/transcode.js index dba722c..b19b90b 100755 --- a/examples/node/transcode.js +++ b/examples/node/transcode.js @@ -4,7 +4,9 @@ const { createWorker } = require('../../src'); const { argv } = process; const [,, inputPath, outputPath] = argv; -const worker = createWorker(); +const worker = createWorker({ + logger: ({ message }) => console.log(message), +}); (async () => { await worker.load(); diff --git a/src/index.js b/src/index.js index de010f7..ab96c68 100755 --- a/src/index.js +++ b/src/index.js @@ -1,6 +1,9 @@ require('regenerator-runtime/runtime'); +const { logging, setLogging } = require('./utils/log'); const createWorker = require('./createWorker'); module.exports = { + logging, + setLogging, createWorker, }; diff --git a/src/worker-script/index.js b/src/worker-script/index.js index 33c50a2..9dd0d45 100644 --- a/src/worker-script/index.js +++ b/src/worker-script/index.js @@ -1,6 +1,7 @@ require('regenerator-runtime/runtime'); const defaultArgs = require('./constants/defaultArgs'); +let action = 'unknown'; let Module = null; let adapter = null; let ffmpeg = null; @@ -25,12 +26,16 @@ const strList2ptr = (strList) => { return listPtr; }; -const load = ({ payload: { options: { corePath } } }, res) => { +const load = ({ workerId, payload: { options: { corePath } } }, res) => { if (Module == null) { const Core = adapter.getCore(corePath); Core() .then((_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']); res.resolve(true); }); @@ -70,6 +75,7 @@ exports.dispatchHandlers = (packet, send) => { res.reject = res.bind(this, 'reject'); res.progress = res.bind(this, 'progress'); + action = packet.action try { ({ load, @@ -79,6 +85,7 @@ exports.dispatchHandlers = (packet, send) => { /** Prepare exception to travel through postMessage */ res.reject(err.toString()); } + action = 'unknown'; }; exports.setAdapter = (_adapter) => {