Skip to content

feat: 兼容低版本 nodejs #39

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 18, 2020
Merged

feat: 兼容低版本 nodejs #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion lib/java/DNJavaConverter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,14 @@ var JavaLexer = require('../../parser/java/Java9Lexer').Java9Lexer
var JavaParser = require('../../parser/java/Java9Parser').Java9Parser
var DNJavaParserListener = require('./DNJavaParserListener').DNJavaParserListener
var ConsoleErrorListener = require('antlr4/error/ErrorListener').ConsoleErrorListener
const { parentPort, workerData } = require('worker_threads')

let parentPort, workerData
try {
parentPort = require('worker_threads').parentPort
workerData = require('worker_threads').workerData
} catch (error) {
console.log('NodeJS version is too low. Running on slow mode.')
}

function convert(path, cb) {
if (!path) {
Expand Down
16 changes: 12 additions & 4 deletions lib/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,15 @@ const { execSync } = require('child_process')
const fs = require("fs")
const path = require("path")
const yaml = require('js-yaml')
const { Worker } = require('worker_threads')
let Worker
let isSupportWorkerThreads = false
try {
Worker = require('worker_threads').Worker
isSupportWorkerThreads = true
} catch (error) {
console.log('NodeJS version is too low. Running on slow mode.')
}


var outputDir
var projectName
Expand Down Expand Up @@ -78,7 +86,7 @@ function writeDependencyToPubSpec(filePath) {

function generateDartWithWorker(path, script) {
return new Promise((resolve, reject) => {
if (this.isDebug) {
if (this.isMainThread) {
const convert = require(script).convert
convert(path, (result, path, error) => {
resolve({ result: result, path: path, error: error })
Expand Down Expand Up @@ -119,8 +127,8 @@ function checkTemplateValid(template) {
return template == 'plugin' || template == 'package'
}

async function main(input, options, debug = false) {
this.isDebug = debug
async function main(input, options, onMainThread = !isSupportWorkerThreads) {
this.isMainThread = onMainThread

language = options.language
if (!language) {
Expand Down
10 changes: 9 additions & 1 deletion lib/objc/DNObjectiveCConverter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,15 @@ let ObjectiveCLexer = require('../../parser/objc/ObjectiveCLexer').ObjectiveCLex
let ObjectiveCParser = require('../../parser/objc/ObjectiveCParser').ObjectiveCParser
let DNObjectiveCParserListener = require('./DNObjectiveCParserListener').DNObjectiveCParserListener
let ConsoleErrorListener = require('antlr4/error/ErrorListener').ConsoleErrorListener
const { parentPort, workerData } = require('worker_threads')

let parentPort, workerData
try {
parentPort = require('worker_threads').parentPort
workerData = require('worker_threads').workerData
} catch (error) {
console.log('NodeJS version is too low. Running on slow mode.')
}


function convert(path, cb) {
if (!path) {
Expand Down