Merge pull request #8 from zlq4863947/zlq-mod

单主题连接bug修正
zlq4863947 · Oct 7, 2017 · fbe9914 · fbe9914
2 parents 4f6bea2 + 35b4432
commit fbe9914
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 25 deletions.
diff --git a/.npmignore b/.npmignore
@@ -1,5 +1,6 @@
 /src
 /log
+/logs
 /node_modules
 /dist/**/*.test.js
 /dist/**/*.test.d.ts

diff --git a/dll/client.cs b/dll/client.cs
@@ -70,7 +70,7 @@ public async Task<object> GetInvoker(IDictionary<string, object> input)
                     ? (Func<object, Task<object>>)opts["callback"] : (o) => null;
 
                 var results = new List<IDictionary<string, object>>();
-
+/*
 				string item = null;
 				if (opts.ContainsKey("item"))
 				{
@@ -149,9 +149,9 @@ public async Task<object> GetInvoker(IDictionary<string, object> input)
                         case "IsPaused":
                             return client.IsPaused;
                     }
-                }
+                } */
 
-                if (clients.Count >= 1)
+                if (clients.Count != 0)
                 {
                     switch (method)
                     {

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ts-dde",
-  "version": "0.1.6",
+  "version": "0.1.8",
   "description": "Dynamic Data Exchange (DDE) 通信组件",
   "repository": {
     "type": "git",

diff --git a/src/lib/client.test.ts b/src/lib/client.test.ts
@@ -111,8 +111,7 @@ describe('DDE客户端测试', () => {
 
   it('测试多个主题的客户端通信', function (done) {
     this.timeout(20000);
-    // testMultipleTopic(done);
-    done();
+    done(); // testMultipleTopic(done);
   });
 
 });
diff --git a/src/lib/client.ts b/src/lib/client.ts
@@ -40,11 +40,6 @@ export class Client extends EventEmitter {
         }
       }
     }
-    const topicKeys = Object.keys(input[Object.keys(input)[0]]);
-    if (topicKeys.length === 1) {
-      // 只有一个主题时，赋值
-      this.item = topicKeys[0];
-    }
     this._invoke = getInvoker(opts, true);
   }
 
@@ -73,9 +68,6 @@ export class Client extends EventEmitter {
   };
 
   poke = (item: string | null, data: string, timeout: number) => {
-    if (item) {
-      this.item = item;
-    }
     this._invoke({
       method: 'Poke',
       item: this.item || '',
@@ -85,9 +77,6 @@ export class Client extends EventEmitter {
   };
 
   request = (item: string | null, format: string, timeout: number) => {
-    if (item) {
-      this.item = item;
-    }
     return this._invoke({
       method: 'Request',
       item: this.item || '',
@@ -96,10 +85,7 @@ export class Client extends EventEmitter {
     }, true);
   };
 
-  startAdvise = (item?: string, format?: string, hot?: boolean, timeout?: number) => {
-    if (item) {
-      this.item = item;
-    }
+  startAdvise = (item?: string[], format?: string, hot?: boolean, timeout?: number) => {
     this._invoke({
       method: 'StartAdvise',
       item: this.item || '',
@@ -109,10 +95,7 @@ export class Client extends EventEmitter {
     }, true);
   };
 
-  stopAdvise = (item?: string, timeout?: number) => {
-    if (item) {
-      this.item = item;
-    }
+  stopAdvise = (item?: string[], timeout?: number) => {
     this._invoke({
       method: 'StopAdvise',
       item: this.item || '',