antlink 0.0.5 → 0.0.7

package/README.md

@@ -17,17 +17,19 @@ $ npm install antlink -g   # 全局安装
 
 
 ```shell
-cd E:\antwork          # 蚁巢位置路径
-ant init               # 建巢（获得安全码）
-ant reset [code]       # 重置蚁巢（需安全码）
+$ cd E:\antwork            # 蚁巢路径 (必须空目录)
+$ ant nest [name]          # 添加蚁巢（获得安全码）     
+$ ant reset [code]         # 重置蚁巢（需要安全码）
+$ ant unlink [code]        # 停止蚁巢（需要安全码）
+$ ant relink [code]        # 重启蚁巢（需要安全码）
 ```
 
 
 ```shell
-ant nest start         # 启动蚁巢
-ant nest stop          # 停止蚁巢
-ant nest restart       # 重启蚁巢
-ant nest status        # 运行状态
+$ ant link                 # 启动蚁巢
+$ ant info                 # 运行状态
+$ ant backup [name]        # 备份蚁巢
+$ ant restore [name]       # 恢复蚁巢
 ```
 
 
@@ -36,6 +38,7 @@ ant nest status        # 运行状态
 
 
 
+
 [npm-v-1]: https://badgen.net/npm/v/antlink
 [npm-v-2]: https://img.shields.io/npm/v/antlink
 [npm-url]: https://www.npmjs.com/package/antlink

package/bin/ant

@@ -1,2 +1,14 @@
-#!/usr/bin/env node
-require('../lib/comm');
+#!/usr/bin/env node
+const arg = process.argv;
+const {version} = require('../package.json');
+const versionFunt = ()=>{console.log('v'+version);}
+if (arg.length < 3) versionFunt();
+if (arg.length > 2) {
+    const arr = require('../lib/json/cmds.json');
+    const name = arg[2].toLowerCase(); // 字母转小写
+    if(arr.includes(name)){
+        require('../lib/order/'+name)(arg.slice(3)); 
+    }else {
+        console.log(`Command '${name}' doesn't exist!`);
+    }
+}

package/lib/json/cmds.json

@@ -1 +1 @@
-["init","nest","reset","info"]
+["nest","reset","link","unlink","relink","info","backup","restore"]

package/lib/order/backup.js

@@ -0,0 +1,12 @@
+'use strict';
+const oss = require('oss-sdk');
+const log = require('../utils/logs');
+module.exports = async(arg)=>{
+	const name = arg[0]||'antlink';
+	try{
+		await oss.tgz.min(process.cwd(),name+'.tgz');
+		log.g('Backup successful');
+	}catch(err){
+		log.r('Backup failed:'+err.message)
+	}	
+}

package/lib/order/nest.js

@@ -0,0 +1,58 @@
+'use strict';
+const oss = require('oss-sdk');
+const log = require('../utils/logs');
+module.exports = async(arg)=>{
+	// 判断蚁巢是否初始化
+	const name = 'nest.ant';
+	const urls = process.cwd();
+	const dir = oss.dir(urls);
+	const resDir = await dir.list();
+	if(resDir?.length>0){
+		// 当前文件夹存在文件，需要清空
+		const file = oss.file(urls);
+		if(await file.ok(name)){
+			// 判断是不是蚁巢
+			try{
+				let fileRes = await file.get(name);
+				fileRes = JSON.parse(fileRes);
+				log.y('Ant Nest Name: '+fileRes.name);
+				const format = require('../utils/format');
+				log.y('Creation Time: '+format(fileRes.addTime,'YYYY-MM-DD HH:mm'));
+			}catch(err){
+				log.r(err)
+			}
+		}else{
+			// 当前文件夹存在文件，需要清空
+			log.r('The current folder is not empty')
+			log.r('Cannot be used to raise ants!')
+		}
+	}else{
+		// 开始初始化
+		const dirAdd = await dir.add('data','evolve','cache','logs');
+		if(dirAdd){
+			// 新建配置文件
+			let obj = {name:arg[0]||'queen'};
+			const {version} = require('../../package.json');
+			obj.version = version;
+			obj.addTime = new Date().getTime();
+			const rrid = require('rrid');
+			obj.appId = rrid.key(32);
+			const scode = rrid.key(32);
+			obj.appKey = rrid.ekey(obj.appId+obj.addTime+scode,obj.appId+obj.addTime+scode);
+			const file = oss.file(process.cwd());
+			const fileAdd = await file.add(name,JSON.stringify(obj));
+			if(fileAdd){
+				// 初始化成功
+				log.g('Initialization successful!');
+				log.y('Security Code：'+scode);
+				log.y('Keep the security code safe')
+			}else{
+				log.r('Initialization failed!');
+				await dir.clear();
+			}
+		}else{
+			//初始化失败：无法创建目录
+			log.r('Initialization failed: unable to create directory')
+		}
+	}
+}

package/lib/order/reset.js

@@ -1,15 +1,16 @@
 'use strict';
-const oss = require('oss-sdk');
+const oss = require('oss-sdk');
+const log = require('../utils/logs');
 const scode = require('../utils/scode');
-const log = require('../utils/logs');
 module.exports = async(arg)=>{
-	const res = await scode(arg[0]);
-	if(res){
+	const obj = await scode(arg[0]);
+	if(obj){
 		// 安全码验证通过
 		const dir = oss.dir(process.cwd());
 		const clear = await dir.clear();
 		if(clear){
-			log.g('Reset successful!');
+			const nest = require('./nest');
+			await nest(obj.name);
 		}else{
 			log.r('Reset failure!');
 		}

package/lib/order/restore.js

@@ -0,0 +1,13 @@
+'use strict';
+const oss = require('oss-sdk');
+const log = require('../utils/logs');
+module.exports = async(arg)=>{
+	const name = arg[0]||'antlink';
+	const paths = oss.path(process.cwd(),name+'.tgz');
+	try{
+		await oss.tgz.max(paths,process.cwd());
+		log.g('Restore successful!');
+	}catch(err){
+		log.r('Restore failed:'+err.message);
+	}
+}

package/lib/order/unlink.js

@@ -0,0 +1,4 @@
+'use strict';
+module.exports = async(arg)=>{
+	console.log(arg);
+}

package/lib/utils/format.js

@@ -0,0 +1,16 @@
+'use strict';
+module.exports = (timestamp,formatStr = 'YYYY-MM-DD HH:mm:ss') => {
+	const date = new Date(timestamp);
+	const padZero  =  (num)=> {
+	  return num.toString().padStart(2, '0');
+	}
+	const map = {
+		YYYY: date.getFullYear(),
+		MM: padZero(date.getMonth() + 1),
+		DD: padZero(date.getDate()),
+		HH: padZero(date.getHours()),
+		mm: padZero(date.getMinutes()),
+		ss: padZero(date.getSeconds())
+	};
+	return formatStr.replace(/YYYY|MM|DD|HH|mm|ss/g, matched => map[matched]);
+}

package/lib/utils/scode.js

@@ -11,12 +11,12 @@ module.exports = async(scode)=>{
 	if(scode) {
 		// 验证安全码
 		const file = oss.file(process.cwd());
-		let conf = await file.get('config.ant');
+		let conf = await file.get('nest.ant');
 		if(conf){
 			try {
 				conf = JSON.parse(conf);
 				const rrid = require('rrid');
-				const key = rrid.ekey(conf.appId+conf.initTime+scode,conf.appId+conf.initTime+scode);
+				const key = rrid.ekey(conf.appId+conf.addTime+scode,conf.appId+conf.addTime+scode);
 				if(key===conf.appKey){
 					// 验证码通过
 					ok = conf;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "antlink",
-	"version": "0.0.5",
+	"version": "0.0.7",
 	"description": "Ant Nest AI Framework.",
 	"main": "index.js",
 	"author": "weduu",
@@ -21,7 +21,7 @@
 		"README.md"
 	],
 	"dependencies": {
-		"oss-sdk": "^1.0.5",
+		"oss-sdk": "^1.0.8",
 		"rrid": "^1.0.7"
 	}
 }

package/bin/plain.md

@@ -1,29 +0,0 @@
-AntLink
-├── bin
-│   └── ant
-├── lib
-│   ├── ants
-│   │   ├── models
-│   │   ├── plugins
-│   │   ├── skills
-│   │   └── tools
-│   ├── json
-│   │   └── cmds.json
-│   ├── order
-│   │   ├── nest
-│   │   │   └── index.js
-│   │   ├── init.js
-│   │   └── reset.js
-│   ├── utils
-│   │   ├── input.js
-│   │   ├── logs.js
-│   │   ├── plain.js
-│   │   └── scode.js
-│   ├── web
-│   │   ├── api
-│   │   └── h5
-│   └── comm.js
-├── index.js
-├── package.json
-├── plain.md
-└── README.md

package/lib/comm.js

@@ -1,19 +0,0 @@
-'use strict';
-fkgConmm();
-async function fkgConmm() {
-    const arg = process.argv;
-    const {version} = require('../package.json');
-	const versionFunt = ()=>{console.log('v'+version);}
-    if (arg.length < 3) versionFunt();
-    if (arg.length > 2) {
-        const arr = require('./json/cmds.json');
-        const name = arg[2].toLowerCase(); // 字母转小写
-        if (name=='-v') {
-            versionFunt();
-        } else if(arr.includes(name)){
-            await require('./order/'+name)(arg.slice(3)); 
-        }else {
-            console.log(`Command '${name}' doesn't exist!`);
-        }
-    }
-}

package/lib/order/init.js

@@ -1,45 +0,0 @@
-'use strict';
-const oss = require('oss-sdk');
-const log = require('../utils/logs');
-module.exports = async()=>{
-	// 判断是否初始化
-	const dir = oss.dir(process.cwd());
-	const res = await dir.list();
-	if(res){
-		if(res.length>0){
-			// 当前文件夹存在文件，需要清空
-			log.r('The current folder is not empty')
-			log.r('This folder must be cleared!')
-		}else{
-			// 开始初始化
-			const dirAdd = await dir.add('nest','data','skills','scripts');
-			if(dirAdd){
-				// 新建配置文件
-				let obj = {};
-				const {version} = require('../../package.json');
-				obj.version = version;
-				obj.initTime = new Date().getTime();
-				const rrid = require('rrid');
-				obj.appId = rrid.key(32);
-				const scode = rrid.key(16);
-				obj.appKey = rrid.ekey(obj.appId+obj.initTime+scode,obj.appId+obj.initTime+scode);
-				const file = oss.file(process.cwd());
-				const fileAdd = await file.add('config.ant',JSON.stringify(obj));
-				if(fileAdd){
-					// 初始化成功
-					log.g('Initialization successful!');
-					log.y('Security Code：'+scode);
-					log.y('Keep the security code safe')
-				}else{
-					log.r('Initialization failed!');
-					await dir.clear();
-				}
-			}else{
-				//初始化失败：无法创建目录
-				log.r('Initialization failed: unable to create directory')
-			}
-		}
-	}else{
-		log.r('Unknown error!')
-	}
-}

package/lib/order/nest/index.js

@@ -1,15 +0,0 @@
-'use strict';
-const log = require('../../utils/logs');
-module.exports = async(arg)=>{
-	if(arg.length===0){
-		log.r('Missing parameter')
-	}else{
-		const cmd = arg[0];
-		const arr = ['start','stop','restart','status'];
-		if(arr.includes(cmd)) {
-			await require('./'+cmd)(arg.slice(1));
-		}else{
-			log.y('Command not found：ant nest '+cmd)
-		}
-	}
-}

package/lib/order/nest/start.js

@@ -1,4 +0,0 @@
-'use strict';
-module.exports = async()=>{
-	console.log(arg);
-}