[web] Switch from ffi-napi to koffi
This commit is contained in:
parent
44e7077f46
commit
d3d204a704
|
@ -1,8 +1,8 @@
|
||||||
const express = require('express');
|
const express = require('express');
|
||||||
const ffi = require('ffi-napi');
|
|
||||||
const path = require('path');
|
const path = require('path');
|
||||||
const yargs = require('yargs/yargs');
|
const yargs = require('yargs/yargs');
|
||||||
const { hideBin } = require('yargs/helpers');
|
const { hideBin } = require('yargs/helpers');
|
||||||
|
const koffi = require('koffi');
|
||||||
|
|
||||||
// Parse command line arguments
|
// Parse command line arguments
|
||||||
const argv = yargs(hideBin(process.argv))
|
const argv = yargs(hideBin(process.argv))
|
||||||
|
@ -33,12 +33,23 @@ const app = express();
|
||||||
app.use(express.json());
|
app.use(express.json());
|
||||||
app.use(express.static('public'));
|
app.use(express.static('public'));
|
||||||
|
|
||||||
const nasalLib = ffi.Library(path.join(__dirname, '../module/libnasal-web'), {
|
let nasalLib;
|
||||||
'nasal_init': ['pointer', []],
|
try {
|
||||||
'nasal_cleanup': ['void', ['pointer']],
|
// First load the library
|
||||||
'nasal_eval': ['string', ['pointer', 'string', 'int']],
|
const lib = koffi.load(path.join(__dirname, '../module/libnasal-web.dylib'));
|
||||||
'nasal_get_error': ['string', ['pointer']]
|
|
||||||
});
|
// Then declare the functions explicitly
|
||||||
|
nasalLib = {
|
||||||
|
nasal_init: lib.func('nasal_init', 'void*', []),
|
||||||
|
nasal_cleanup: lib.func('nasal_cleanup', 'void', ['void*']),
|
||||||
|
nasal_eval: lib.func('nasal_eval', 'const char*', ['void*', 'const char*', 'int']),
|
||||||
|
nasal_get_error: lib.func('nasal_get_error', 'const char*', ['void*'])
|
||||||
|
};
|
||||||
|
|
||||||
|
} catch (err) {
|
||||||
|
console.error('Failed to load nasal library:', err);
|
||||||
|
process.exit(1);
|
||||||
|
}
|
||||||
|
|
||||||
app.post('/eval', (req, res) => {
|
app.post('/eval', (req, res) => {
|
||||||
const { code, showTime = false } = req.body;
|
const { code, showTime = false } = req.body;
|
||||||
|
|
Loading…
Reference in New Issue