tmui-cli 1.2.0 → 1.2.2

package/bin/cmdTool.js

@@ -1,12 +1,13 @@
-
-const path  = require("path")
-const fs  = require("fs")
-const {spawn,exec}  = require("child_process")
-const process  = require("process")
-const codecs  = require("codecs")
-const psTree  = require("ps-tree")
-
-
+import fs from "fs"
+import path from "path"
+import {
+	spawn,
+	exec
+} from "child_process"
+import process from "process"
+import codecs from "codecs"
+import psTree from "ps-tree"
+import iconv from "iconv-lite"
 
 
 function detectEncoding(str) {
@@ -24,12 +25,12 @@ function detectEncoding(str) {
 
 
 function send(ws, arg) {
-	ws.forEach(function(el){
+	ws.forEach(el => {
 		el.send(arg)
 	})
 }
 
-function execCmd(cb, end, command) {
+export function execCmd(cb, end, command) {
 	try {
 		// const npmPath = path.join(process.env.APPDATA, 'npm', 'npm.cmd');
 		const spawnObj = exec(command, {
@@ -51,7 +52,7 @@ function execCmd(cb, end, command) {
 				cb(cleanStr, spawnObj.pid || 0)
 			}
 		});
-		spawnObj.addListener('error', function(err) {
+		spawnObj.addListener('error', (err) => {
 			if (end) {
 				cb(err)
 				end('error')
@@ -63,7 +64,7 @@ function execCmd(cb, end, command) {
 				end('end')
 			}
 		})
-		spawnObj.on('exit', function(code){
+		spawnObj.on('exit', (code) => {
 			// console.log('exit code : ' + code);
 			if (end) {
 				end('end')
@@ -80,12 +81,12 @@ function execCmd(cb, end, command) {
 	}
 }
 // 杀死子进程及其所有子孙进程
-function killChildAndGrandChildren(pid) {
+export function killChildAndGrandChildren(pid) {
 
 	if (process.platform === 'win32') {
 		// 在 Windows 系统上执行的代码
 		const command = `taskkill /T /F /PID ${pid}`;
-		exec(command, function(err, stdout, stderr){
+		exec(command, (err, stdout, stderr) => {
 			if (err) {
 				console.error(`服务进程退出失败！不要担心，当你关闭主进程时，未退出的子进程会一并关闭哦`);
 			}
@@ -94,16 +95,16 @@ function killChildAndGrandChildren(pid) {
 		});
 	} else {
 		// 在 Linux/Unix/Mac 系统上执行的代码
-		psTree(pid, function(err, children){
+		psTree(pid, (err, children) => {
 			// 使用 kill 命令杀死所有子孙进程
 			console.log(5555)
-			exec(`kill -TERM ${pid} ${children.map(function(c) {return c.PID}).join(' ')}`);
+			exec(`kill -TERM ${pid} ${children.map(c => c.PID).join(' ')}`);
 		});
 	}
 
 }
 
-function devRunApp(ws, obj) {
+export function devRunApp(ws, obj) {
 
 	const nowcd = process.cwd();
 	process.chdir(path.normalize(obj.data.path));
@@ -171,7 +172,7 @@ function devRunApp(ws, obj) {
 	return childreProcess;
 }
 
-function buildApp(ws, obj, end) {
+export function buildApp(ws, obj, end) {
 
 	const nowcd = process.cwd();
 	process.chdir(path.normalize(obj.data.path));
@@ -219,11 +220,4 @@ function buildApp(ws, obj, end) {
 	return childreProcess;
 }
 
-module.exports = {
-	execCmd,
-	killChildAndGrandChildren,
-	devRunApp,
-	buildApp
-}
-
 

package/bin/createTmui.js

@@ -1,9 +1,7 @@
-
-const path  = require("path")
-const {execCmd}  = require("./cmdTool.js")
-const fs  = require("fs")
-const compressing  = require("compressing")
-const Fetch  = import("node-fetch")
+import path from "path";
+import fs from "fs"
+import compressing from "compressing"
+import { execCmd } from "./cmdTool.js";
 
 
 const uniappDevListVer = [
@@ -76,10 +74,10 @@ function writePackageJson(filepath, str) {
 /**
  * 更新项目.
  * @param {{path,type,uvue,tmui,uniappver}} arg 
+ * @param {(str)=>{}} call 
+ * @param {()=>{}} end 
  */
-async function UpdateTmui(arg, call, end) {
-    const fetch = (await Fetch).default;
-
+export async function UpdateTmui(arg, call, end) {
     let rootdir = path.normalize(arg.path)
     call('检测目录...')
     if (!fs.existsSync(rootdir)) {
@@ -171,7 +169,7 @@ async function UpdateTmui(arg, call, end) {
         let initjson = readPackageJson(packjsonDir)
         if (initjson['dependencies']['@dcloudio/uni-app'] != arg.uniappver) {
             call(`检测到cli版本与你选中的不一样,正在设置你选中的版本号`)
-            uniappDevListVer.forEach( function(el) {
+            uniappDevListVer.forEach(el => {
                 if (initjson['dependencies'][el]) {
                     initjson['dependencies'][el] = arg.uniappver
                 }
@@ -183,9 +181,9 @@ async function UpdateTmui(arg, call, end) {
 
             writePackageJson(packjsonDir, JSON.stringify(initjson, null, 4))
 
-            execCmd(function (datastr){
+            execCmd((datastr) => {
                 call(datastr)
-            }, function () {
+            }, () => {
                 end()
             }, 'npm install --save --registry=https://registry.npmmirror.com/')
 
@@ -203,10 +201,10 @@ async function UpdateTmui(arg, call, end) {
 /**
  * 
  * @param {{name,rootDir,type,ver,uniappver,uniappBuildType,machine}} arg 
+ * @param {(str)=>{}} call 
+ * @param {(str?:string)=>{}} end 
  */
-async function createTmui(arg, call, end) {
-    const fetch = (await Fetch).default;
-
+export async function createTmui(arg, call, end) {
     let rootdir = path.normalize(arg.rootDir)
     call('检测目录...')
     if (!fs.existsSync(rootdir)) {
@@ -343,7 +341,7 @@ async function createTmui(arg, call, end) {
         let initjson = readPackageJson(packjsonDir)
         
         
-        uniappDevListVer.forEach(function (el) {
+        uniappDevListVer.forEach(el => {
             if (initjson['dependencies'][el]) {
                 initjson['dependencies'][el] = arg.uniappver
             }
@@ -361,9 +359,9 @@ async function createTmui(arg, call, end) {
       
         writePackageJson(packjsonDir, JSON.stringify(initjson, null, 4))
 
-        execCmd(function (datastr) {
+        execCmd((datastr) => {
             call(datastr)
-        }, function () {
+        }, () => {
             end(rootdir)
         }, 'npm install --save --registry=https://registry.npmmirror.com/')
 
@@ -374,10 +372,4 @@ async function createTmui(arg, call, end) {
 
     end(rootdir)
 
-}
-
-module.exports = {
-    createTmui,
-    UpdateTmui,
-    delFile
 }

package/bin/dirTool.js

@@ -1,7 +1,14 @@
-const path  = require("path")
-const fs  = require("fs")
+import fs from "fs"
+import path from "path"
+import {
+	spawn,
+	exec
+} from "child_process"
+import process from "process"
+import os from "os"
 
-function getJsonFiles(jsonPath) {
+
+export function getJsonFiles(jsonPath) {
 	let jsonFiles = [];
 
 	function findJsonFile(www) {
@@ -21,7 +28,7 @@ function getJsonFiles(jsonPath) {
 	return jsonFiles;
 }
 
-function getJsonDir(basePath = './') {
+export function getJsonDir(basePath = './') {
 	const dirPath = basePath;
 	const root = {
 		name: '',
@@ -64,7 +71,6 @@ function getJsonDir(basePath = './') {
 		}
 
 	}
-	// @ts-ignore
 	root.children = tree;
 
 
@@ -72,7 +78,7 @@ function getJsonDir(basePath = './') {
 }
 
 /**读取项目信息根据提供的路径。 */
-function checkProject(obj) {
+export function checkProject(obj) {
 	
 	// const {id,path,type} = obj;
 	let mainsetStrPath = "";
@@ -144,9 +150,3 @@ function checkProject(obj) {
 	}
 }
 
-
-module.exports = {
-	getJsonFiles,
-	getJsonDir,
-	checkProject
-}

package/bin/hooks.js

@@ -1,15 +1,13 @@
-const figlet = require("figlet")
-const chalks = import("chalk")
-
-const {createTmui,UpdateTmui} = require("./createTmui.js")
-const {checkProject} = require("./dirTool.js")
-const {selectedDir} = require("./selectedDir.js")
-const osUtils = require("node-os-utils")
-const {WebSocketServer} = require("ws")
-const {execCmd, devRunApp, killChildAndGrandChildren, buildApp} = require("./cmdTool.js")
-
 
+import {WebSocketServer} from 'ws'
+import osUtils from 'node-os-utils'
+import { execCmd, devRunApp, killChildAndGrandChildren, buildApp } from './cmdTool.js'
+import { selectedDir } from './selectedDir.js'
+import { checkProject} from './dirTool.js'
+import { Chalk } from "chalk";
+import { createTmui,UpdateTmui } from './createTmui.js'
 
+let chalk = new Chalk()
 
 
 
@@ -46,18 +44,17 @@ function uuid(len = 24, radix) {
     return uuid.join('');
 }
 function removeWs(id) {
-    const index = wslist.findIndex(function(el) {return el.uuid == id})
+    const index = wslist.findIndex(el => el.uuid == id)
     if (index > -1) {
         wslist.splice(index, 1)
     }
 }
 function send(arg) {
-    wslist.forEach(function(el) {
+    wslist.forEach(el => {
         el.send(arg)
     })
 }
-wss.on('connection', async function connection(ws) {
-    const chalk = (await chalks).default;
+wss.on('connection', function connection(ws) {
 
     ws.uuid = uuid();
     wslist.push(ws)
@@ -101,7 +98,7 @@ wss.on('connection', async function connection(ws) {
                 // 查询目录项目的信息
             } else if (obj.event == '17') {
                 let result = checkProject(obj.command)
-                let runfl = runAppInfoList.filter(function(el){ return el.id == result.id})
+                let runfl = runAppInfoList.filter(el => el.id == result.id)
                 send(JSON.stringify({
                     event: '17',
                     data: result,
@@ -127,12 +124,12 @@ wss.on('connection', async function connection(ws) {
                     if (!obj.command) return;
                     // process.kill(Number(obj.command||0))
                     const pid = Number(obj.command || 0);
-                    const index = processList.findIndex(function(el){ return el.pid == pid})
+                    const index = processList.findIndex(el => el.pid == pid)
                     if (index > -1) {
                         // process.kill(sflit[0].pid)
                         killChildAndGrandChildren(processList[index].pid)
                         processList.splice(index, 1)
-                        const index2 = runAppInfoList.findIndex(function(el){ return el.pid == pid})
+                        const index2 = runAppInfoList.findIndex(el => el.pid == pid)
                         runAppInfoList.splice(index2, 1)
                     }
                 } catch (error) {
@@ -141,8 +138,8 @@ wss.on('connection', async function connection(ws) {
                 /**编译应用build:xx */
             } else if (obj.event == '3') {
                 const id = obj.command.data.id;
-                const childrenProcess = buildApp(wslist, obj.command, function() {
-                    const index2 = runAppInfoList.findIndex(function(el){ return el.id == id})
+                const childrenProcess = buildApp(wslist, obj.command, () => {
+                    const index2 = runAppInfoList.findIndex(el => el.id == id)
                     console.log("编译结束")
                     if (index2 > -1) {
                         runAppInfoList.splice(index2, 1)
@@ -150,7 +147,7 @@ wss.on('connection', async function connection(ws) {
                 })
                 /**保存当前运行的用户信息。 */
             } else if (obj.event == 'saveRunInfo') {
-                const index2 = runAppInfoList.findIndex(function(el){return el.id == obj.command.id})
+                const index2 = runAppInfoList.findIndex(el => el.id == obj.command.id)
                 if (index2 > -1) {
                     runAppInfoList.splice(index2, 1, obj.command)
                 } else {
@@ -160,7 +157,7 @@ wss.on('connection', async function connection(ws) {
             } else if (obj.event == 'getCpu') {
                 
                Promise.all([osUtils.mem.info(),osUtils.cpu.usage()])
-               .then(function(arg){
+               .then(arg=>{
                     send(JSON.stringify({
                         event: 'getCpu',
                         data: {
@@ -171,13 +168,13 @@ wss.on('connection', async function connection(ws) {
                })
             }else if(obj.event=='21'){
                 // npm view @dcloudio/uni-app versions --json
-                UpdateTmui(obj.command,function(str){
+                UpdateTmui(obj.command,(str)=>{
                     send(JSON.stringify({
                         event: 'info',
                         flag:'',
                         data: str
                     }))
-                },function(){
+                },()=>{
                     send(JSON.stringify({
                         event: '21',
                         flag:'end',
@@ -187,13 +184,13 @@ wss.on('connection', async function connection(ws) {
                 // 创建项目.
             }else if(obj.event=='22'){
                 // npm view @dcloudio/uni-app versions --json
-                createTmui(obj.command,function(str){
+                createTmui(obj.command,(str)=>{
                     send(JSON.stringify({
                         event: 'info',
                         flag:'',
                         data: str
                     }))
-                },function(prejectdir){
+                },(prejectdir)=>{
                     send(JSON.stringify({
                         event: '22',
                         flag:'end',
@@ -208,7 +205,7 @@ wss.on('connection', async function connection(ws) {
 			console.log(chalk.red(error))
         }
     });
-    ws.on('close', function() {
+    ws.on('close', () => {
         removeWs(ws.uuid)
     })
     send('something');

package/bin/net.js

@@ -1,8 +1,11 @@
-const Open  = import("open")
-const bodyParser  = require("body-parser")
-const Fetch  = import("node-fetch")
-const express  = require("express")
-
+import express from "express"
+import fs from "fs"
+import {spawn} from "child_process"
+import iconv from "iconv-lite"
+import BufferHelper from "bufferhelper"
+import open from "open"
+import bodyParser from "body-parser"
+import fetch from "node-fetch"
 const app = express();
 
 var jsonParser = bodyParser.json()
@@ -19,7 +22,7 @@ function setResHeader(res){
 app.use(express.static('website'))
 app.use('/store', express.static('websitemod'))
 
-app.all("/api/dirlist",function (req,res){
+app.all("/api/dirlist",(req,res)=>{
     setResHeader(res)
     // const ls = getJsonFiles( __dirname )
     // res.json(ls)
@@ -27,9 +30,7 @@ app.all("/api/dirlist",function (req,res){
     res.json({'code':0})
 })
 //获取tmui版本
-app.post("/api/cehckTmuiVer",async function (req,res){
-    const fetch = (await Fetch).default;
-    
+app.post("/api/cehckTmuiVer",async (req,res)=>{
     setResHeader(res)
     let type = req.body?.type??'uniapp'
 
@@ -40,9 +41,7 @@ app.post("/api/cehckTmuiVer",async function (req,res){
     
 })
 
-app.post("/api/checkUniappVer",async function (req,res){
-    const fetch = (await Fetch).default;
-
+app.post("/api/checkUniappVer",async (req,res)=>{
     setResHeader(res)
     // https://registry.npmjs.org/@dcloudio/uni-app
 	let resdata = await fetch(`https://mirrors.huaweicloud.com/repository/npm/@dcloudio/uni-app`,{method:'GET',headers:{'Content-Type':'text/plan'}})
@@ -65,7 +64,7 @@ app.post("/api/checkUniappVer",async function (req,res){
 
    
     lis = lis.slice(0,40)
-    lis = lis.filter(function(el){ return el[0]!='2'})
+    lis = lis.filter(el=>el[0]!='2')
     obj.versions = lis
     res.json({'code':0,'data':obj})
     
@@ -75,19 +74,12 @@ app.post("/api/checkUniappVer",async function (req,res){
 
 
 
-function createNet (){
-   
-
-    app.listen(6170,async function (){
-        const open = (await Open).default;
+export const createNet = ()=>{
+    app.listen(6170,()=>{
         open('http://localhost:6170')
-        
     })
 }
 
-module.exports = {
-    createNet
-}
 
 
 // open('http://localhost:6170')

package/bin/selectedDir.js

@@ -1,9 +1,13 @@
-const path = require("path")
-const globalDirectories = require("global-dirs")
-const { getJsonDir } = require("./dirTool.js")
+import path from "path"
+import fs from "fs"
+
+import globalDirectories from "global-dirs"
+import {
+	getJsonDir
+} from "./dirTool.js"
 
 /**读取项目目录 */
-function selectedDir(cb, end, pathStr) {
+export async function selectedDir(cb, end, pathStr) {
 	try {
 		let dirpath = globalDirectories.npm.prefix
 		if (pathStr) {
@@ -22,7 +26,3 @@ function selectedDir(cb, end, pathStr) {
 }
 
 
-module.exports = {
-	selectedDir
-}
-

package/bin/tmui.js

@@ -1,12 +1,12 @@
-const figlet = require("figlet")
-const chalks = import("chalk")
-const {createNet} = require("./net.js")
-require("./hooks.js")
+import { Chalk } from "chalk";
+import figlet from "figlet"
+import { createNet } from "./net.js";
+import "./hooks.js";
 
-chalks.then(v => {
-    const chalk = new v.Chalk()
-    figlet('TMUI for UniApp', function (err, d) {
-        if (err) {
+let chalk = new Chalk()
+const main = ()=>{
+    figlet('TMUI for UniApp',function(err,d){
+        if(err){
             console.log(chalk.red(err))
             console.dir(err)
             return
@@ -16,4 +16,7 @@ chalks.then(v => {
         console.log(chalk.yellow('请访问：http://localhost:6170'))
         createNet()
     })
-})
+}
+
+main();
+

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "tmui-cli",
-  "version": "1.2.0",
-  "type": "commonjs",
+  "version": "1.2.2",
+  "type": "module",
   "description": "tmui2.0,3.0,4.0x,3.2",
   "main": "./bin/tmui.js",
   "scripts": {
@@ -12,7 +12,12 @@
   "keywords": [
     "tmui"
   ],
-  "author": "tmzdy",
+  "author": {
+    "name": "tmzdy"
+  },
+  "bin": {
+    "tmui": "bin/tmui.js"
+  },
   "license": "MIT",
   "dependencies": {
     "@babel/runtime": "^7.25.7",