Merge remote-tracking branch 'origin/master'

apache · Jun 28, 2018 · b59f48b · b59f48b
2 parents 7a60a78 + a9d9d5c
commit b59f48b
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 12 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,7 @@
 .idea
+.project
+.settings
+.classpath
 # Logs
 logs
 *.log
@@ -41,4 +44,4 @@ logs
 *.iml
 target
 es6
-es7
+es7
diff --git a/examples/hello-koa/dubbo/dubbo.js b/examples/hello-koa/dubbo/dubbo.js
@@ -11,11 +11,11 @@ const dubbo = (module.exports = new Dubbo({
 //   console.log('dubbo was ready');
 // });
 
-dubbo.subscribe({
-  onTrace: msg => {
-    console.log(msg);
-  },
-});
+// dubbo.subscribe({
+//   onTrace: msg => {
+//     console.log(msg);
+//   },
+// });
 
 //cost middleware
 /*dubbo.use(async function costTime(ctx, next) {

diff --git a/packages/dubbo/package.json b/packages/dubbo/package.json
@@ -1,6 +1,6 @@
 {
   "name": "dubbo2.js",
-  "version": "2.1.4",
+  "version": "2.1.5",
   "main": "./es7/index.js",
   "types": "./es7/typings/index.d.ts",
   "license": "Apache Licence 2.0",

diff --git a/packages/dubbo/src/byte.ts b/packages/dubbo/src/byte.ts
@@ -30,7 +30,8 @@ export const fromBytes4 = (buf: Buffer) => {
 
 export const toBytes8 = (num: number) => {
   const buf = Buffer.allocUnsafe(8);
-  const high = Math.floor(num / Math.pow(2, 32));
+  //2 ** 32 = 4294967296
+  const high = Math.floor(num / 4294967296);
   const low = (num & 0xffffffff) >>> 0;
   buf.writeUInt32BE(high, 0);
   buf.writeUInt32BE(low, 4);

diff --git a/packages/dubbo/src/zookeeper.ts b/packages/dubbo/src/zookeeper.ts
@@ -21,10 +21,10 @@ import zookeeper from 'node-zookeeper-client';
 import qs from 'querystring';
 import Context from './context';
 import DubboUrl from './dubbo-url';
-import {ZookeeperDisconnectedError, ZookeeperTimeoutError} from './err';
-import {to} from './to';
-import {IObservable, IZkClientProps, IZookeeperSubscriber} from './types';
-import {isDevEnv, msg, noop, traceErr, traceInfo} from './util';
+import { ZookeeperDisconnectedError, ZookeeperTimeoutError } from './err';
+import { to } from './to';
+import { IObservable, IZkClientProps, IZookeeperSubscriber } from './types';
+import { isDevEnv, msg, noop, traceErr, traceInfo } from './util';
 
 const log = debug('dubbo:zookeeper');
 const ipAddress = ip.address();