@bbk47/toolbox 1.0.2 → 1.0.4

package/README.md

@@ -11,5 +11,6 @@ A tool library for bbk/abc
 - aes encrypt
 - logger util
 - md5 encrypt
-- socks5 addr parse
+- socks5 addr parse and build
 - uuid util
+- merge object

package/lib/encrypt.js

@@ -63,7 +63,7 @@ Encryptor.prototype.get_cipher_len = function (method) {
 
 Encryptor.prototype.getKeyIV = function (password, method) {
   method = method.toLowerCase();
-  password = Buffer.from(password, "binary");
+  password = Buffer.from(password, "ascii");
   var m = this.get_cipher_len(method);
   var _ref = EVP_BytesToKey(password, m[0], m[1]);
   return { key: _ref[0], iv: _ref[1] };

package/lib/merge.js

@@ -0,0 +1,29 @@
+function factory(overide) {
+    return function assign(target) {
+        target = target || {};
+        var args = [].slice.call(arguments, 1);
+        args.forEach((temp) => {
+            if (temp) {
+                Object.keys(temp).forEach((key) => {
+                    if (overide) {
+                        target[key] = temp[key];
+                    } else if (temp[key]) {
+                        target[key] = temp[key];
+                    }
+                });
+            }
+        });
+        return target;
+    };
+}
+
+function merge(target) {
+    return factory(false).apply(target, arguments);
+}
+
+function assign(target) {
+    return factory(true).apply(target, arguments);
+}
+
+exports.objectMerge = merge;
+exports.objectAssign = assign;

package/lib/socks5.js

@@ -1,4 +1,4 @@
-exports.parseAddrInfo = function (buf, offset) {
+function parseSocks5Addr(buf, offset) {
     if (offset !== 0) {
         buf = buf.slice(offset);
     }
@@ -20,4 +20,30 @@ exports.parseAddrInfo = function (buf, offset) {
         dstPort = port[0] * 256 + port[1];
     }
     return { dstAddr, dstPort };
-};
+}
+
+function buildSocks5Addr(hostname, port) {
+    var socksAddrInfoBuf;
+    if (/^(\d+\.){3}\d+$/.test(hostname)) {
+        const parts = hostname.split('.').map((p) => Number(p));
+        const portBuf = Buffer.from([parseInt(port / 256), port % 256]);
+        const preBuf = Buffer.from([0x01, parts[0], parts[1], parts[2], parts[3]]);
+        socksAddrInfoBuf = Buffer.concat([preBuf, portBuf]);
+    } else {
+        const domain = hostname;
+        const preBuf = Buffer.from([0x03, domain.length]);
+        const domainBuf = Buffer.from(domain);
+        const portBuf = Buffer.from([parseInt(port / 256), port % 256]);
+        socksAddrInfoBuf = Buffer.concat([preBuf, domainBuf, portBuf]);
+    }
+    return socksAddrInfoBuf;
+}
+
+exports.parseAddrInfo = parseSocks5Addr;
+exports.parseSocks5Addr = parseSocks5Addr;
+exports.buildSocks5Addr = buildSocks5Addr;
+
+// console.log(buildSocks5Addr('1.2.4.8', 8899).toString('hex'));
+// console.log(buildSocks5Addr('181.58.189.23', 5478).toString('hex'));
+// console.log(buildSocks5Addr('www.baidu.com', 1099).toString('hex'));
+// console.log(buildSocks5Addr('kefdka.1231.a123baidu.com', 65534).toString('hex'));

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@bbk47/toolbox",
-    "version": "1.0.2",
+    "version": "1.0.4",
     "description": "toolbox for bbk",
     "main": "lib/index.js",
     "scripts": {

package/test/encrypt.js

@@ -7,9 +7,6 @@ describe('encrypt', function () {
         const worker = new encrypt.Encryptor('csii2019', 'aes-256-cfb');
 
         const result1 = worker.encrypt(Buffer.from('hello,world'));
-        const result12 = worker.encrypt(Buffer.from('hello,world'));
-        console.log(result1)
-        console.log(result2)
         const result2 = worker.encrypt(Buffer.from('818c9ba2109b4c505155aebf6d3647a3'));
         const result3 = worker.encrypt(Buffer.from('818c9ba2109b4c505155aebf6d3647a2'));
 

package/test/merge.js

@@ -0,0 +1,17 @@
+const assert = require('assert');
+const merge = require('../lib/merge');
+const { describe } = require('mocha');
+
+describe('socks5', function () {
+    it('test object merge', function () {
+        var obj = merge.objectMerge({ sss: 1 }, { sss: 123 }, { bb: 456 }, { sss: null });
+        assert.equal(obj.sss, 123);
+        assert.equal(obj.bb, 456);
+    });
+
+    it('test object assign', function () {
+        var obj = merge.objectAssign({ sss: 12 }, { sss: 123 }, { bb: 456 }, { sss: null ,bb:789});
+        assert.equal(obj.sss, null);
+        assert.equal(obj.bb, 789);
+    });
+});

package/test/socks5.js

@@ -3,21 +3,40 @@ const socks5 = require('../lib/socks5');
 const { describe } = require('mocha');
 
 describe('socks5', function () {
-    it('test socks5 ipv4 example', function () {
-        const obj1 = { type: 1, addr: '1.2.4.8' };
-        const buf = Buffer.from([0x01, 0x01, 0x02, 0x04, 0x08, 0x00, 0x50]);
-        const obj = socks5.parseAddrInfo(buf);
-        assert.equal(obj.dstAddr, '1.2.4.8');
-        assert.equal(obj.dstPort, 80);
+
+    it('test socks5 parse ip example', function () {
+        const obj1 = socks5.parseSocks5Addr(Buffer.from('010102040822c3', 'hex'));
+        assert.equal(obj1.dstAddr, '1.2.4.8');
+        assert.equal(obj1.dstPort, 8899);
+
+        const obj2 = socks5.parseSocks5Addr(Buffer.from('01b53abd171566', 'hex'));
+        assert.equal(obj2.dstAddr, '181.58.189.23');
+        assert.equal(obj2.dstPort, 5478);
+    });
+
+    it('test socks5 parse domain example', function () {
+        const obj1 = socks5.parseSocks5Addr(Buffer.from('030d7777772e62616964752e636f6d044b', 'hex'));
+        assert.equal(obj1.dstAddr, 'www.baidu.com');
+        assert.equal(obj1.dstPort, 1099);
+
+        const obj2 = socks5.parseSocks5Addr(Buffer.from('03196b6566646b612e313233312e6131323362616964752e636f6dfffe', 'hex'));
+        assert.equal(obj2.dstAddr, 'kefdka.1231.a123baidu.com');
+        assert.equal(obj2.dstPort, 65534);
+    });
+
+    it('test socks5 build  ipv4 example', function () {
+        const buf1 = socks5.buildSocks5Addr("1.2.4.8",8899);
+        assert.equal(buf1.toString('hex'), '010102040822c3');
+        const buf2 = socks5.buildSocks5Addr("181.58.189.23",5478);
+        assert.equal(buf2.toString('hex'), '01b53abd171566');
     });
 
-    it('test socks5 domain example', function () {
-        const obj1 = { type: 3, addr: 'www.baidu.com' };
-        const buf1 = Buffer.from([0x03, 0x0d]);
-        const buf = Buffer.concat([buf1, Buffer.from('www.baidu.com'), Buffer.from([0x00, 0x17])]);
-        const obj = socks5.parseAddrInfo(buf);
-        // console.log(obj);
-        assert.equal(obj.dstAddr, 'www.baidu.com');
-        assert.equal(obj.dstPort, 23);
+    it('test socks5 build  domain example', function () {
+        const buf1 = socks5.buildSocks5Addr("www.baidu.com",1099);
+        assert.equal(buf1.toString('hex'), '030d7777772e62616964752e636f6d044b');
+        const buf2 = socks5.buildSocks5Addr("kefdka.1231.a123baidu.com",65534);
+        assert.equal(buf2.toString('hex'), '03196b6566646b612e313233312e6131323362616964752e636f6dfffe');
     });
+
+    
 });

package/ss.js

@@ -1,8 +0,0 @@
-const encrypt = require('./lib/encrypt')
-
-const worker = new encrypt.Encryptor('csii2019', 'aes-256-cfb');
-
-const result1 = worker.encrypt(Buffer.from('hello,world'));
-const result12 = worker.encrypt(Buffer.from('hello,world'));
-console.log(result1)
-console.log(result12)