From c507dc16dc554692e54b469c1964efe1cff067c6 Mon Sep 17 00:00:00 2001 From: Shuduo Sang Date: Wed, 6 Jan 2021 14:54:50 +0800 Subject: [PATCH] [TD-2674] fix: fix load library on Windows platform. --- src/connector/nodejs/nodetaos/cinterface.js | 9 ++++++++- src/connector/nodejs/package.json | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/connector/nodejs/nodetaos/cinterface.js b/src/connector/nodejs/nodetaos/cinterface.js index 995babdb2b..a246256f15 100644 --- a/src/connector/nodejs/nodetaos/cinterface.js +++ b/src/connector/nodejs/nodetaos/cinterface.js @@ -4,6 +4,7 @@ */ const ref = require('ref'); +const os = require('os'); const ffi = require('ffi'); const ArrayType = require('ref-array'); const Struct = require('ref-struct'); @@ -188,7 +189,13 @@ function CTaosInterface (config = null, pass = false) { ref.types.void_ptr2 = ref.refType(ref.types.void_ptr); /*Declare a bunch of functions first*/ /* Note, pointers to TAOS_RES, TAOS, are ref.types.void_ptr. The connection._conn buffer is supplied for pointers to TAOS * */ - this.libtaos = ffi.Library('libtaos', { + + if ('win32' == os.platform()) { + taoslibname = 'taos'; + } else { + taoslibname = 'libtaos'; + } + this.libtaos = ffi.Library(taoslibname, { 'taos_options': [ ref.types.int, [ ref.types.int , ref.types.void_ptr ] ], 'taos_init': [ ref.types.void, [ ] ], //TAOS *taos_connect(char *ip, char *user, char *pass, char *db, int port) diff --git a/src/connector/nodejs/package.json b/src/connector/nodejs/package.json index 2d5cf45e1d..5587a69e01 100644 --- a/src/connector/nodejs/package.json +++ b/src/connector/nodejs/package.json @@ -1,6 +1,6 @@ { "name": "td2.0-connector", - "version": "2.0.4", + "version": "2.0.5", "description": "A Node.js connector for TDengine.", "main": "tdengine.js", "scripts": { -- GitLab