From 3bfbbc8c10f3c35a612c4b1c70155f30a928b96e Mon Sep 17 00:00:00 2001 From: Shuduo Sang Date: Fri, 15 Jan 2021 19:26:31 +0800 Subject: [PATCH] [TD-2769] :nodejs 12+ adapt --- src/connector/nodejs/nodetaos/cinterface.js | 10 +++++----- src/connector/nodejs/nodetaos/cursor.js | 2 +- tests/examples/nodejs/nodejsChecker.js | 3 ++- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/connector/nodejs/nodetaos/cinterface.js b/src/connector/nodejs/nodetaos/cinterface.js index a246256f15..43a08a800a 100644 --- a/src/connector/nodejs/nodetaos/cinterface.js +++ b/src/connector/nodejs/nodetaos/cinterface.js @@ -3,15 +3,15 @@ * @module CTaosInterface */ -const ref = require('ref'); +const ref = require('ref-napi'); const os = require('os'); -const ffi = require('ffi'); -const ArrayType = require('ref-array'); -const Struct = require('ref-struct'); +const ffi = require('ffi-napi'); +const ArrayType = require('ref-array-napi'); +const Struct = require('ref-struct-napi'); const FieldTypes = require('./constants'); const errors = require ('./error'); const TaosObjects = require('./taosobjects'); -const { NULL_POINTER } = require('ref'); +const { NULL_POINTER } = require('ref-napi'); module.exports = CTaosInterface; diff --git a/src/connector/nodejs/nodetaos/cursor.js b/src/connector/nodejs/nodetaos/cursor.js index 0c9214fe32..e18e6c2500 100644 --- a/src/connector/nodejs/nodetaos/cursor.js +++ b/src/connector/nodejs/nodetaos/cursor.js @@ -1,4 +1,4 @@ -const ref = require('ref'); +const ref = require('ref-napi'); require('./globalfunc.js') const CTaosInterface = require('./cinterface') const errors = require ('./error') diff --git a/tests/examples/nodejs/nodejsChecker.js b/tests/examples/nodejs/nodejsChecker.js index f838d5cc84..7cb10ea932 100644 --- a/tests/examples/nodejs/nodejsChecker.js +++ b/tests/examples/nodejs/nodejsChecker.js @@ -1,4 +1,5 @@ -const taos = require('td2.0-connector'); +//const taos = require('td2.0-connector'); +const taos = require('../../../src/connector/nodejs/'); var host = null;