From 202f2f6eb3cb9ad2277e954feb0bbfe8df5def9c Mon Sep 17 00:00:00 2001 From: Seon-Wook Park Date: Tue, 24 Jun 2014 00:05:22 +0900 Subject: [PATCH 1/4] noble: Add Peripheral.updateRssi method --- noble/noble.d.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/noble/noble.d.ts b/noble/noble.d.ts index f9c833bd13..3a2765d7b7 100644 --- a/noble/noble.d.ts +++ b/noble/noble.d.ts @@ -27,6 +27,7 @@ declare module "noble" { connect(callback: (error: string) => void): void; disconnect(callback: () => void): void; + updateRssi(callback: (error: string, rssi: number) => void): void; discoverServices(serviceUUIDs: string[], listener: (error: string, services: Service[]) => void): void; discoverAllServicesAndCharacteristics(callback: (error: string, services: Service[], characteristics: Characteristic[]) => void): void; discoverSomeServicesAndCharacteristics(serviceUUIDs: string[], characteristicUUIDs: string[], callback: (error: string, services: Service[], characteristics: Characteristic[]) => void): void; From 9886325bf6dd1083d241e0d8d5213840eb8aa934 Mon Sep 17 00:00:00 2001 From: Seon-Wook Park Date: Tue, 24 Jun 2014 00:11:37 +0900 Subject: [PATCH 2/4] noble: Add test for new peripheral.updateRssi --- noble/noble-tests.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/noble/noble-tests.ts b/noble/noble-tests.ts index 46851ab523..852174530f 100644 --- a/noble/noble-tests.ts +++ b/noble/noble-tests.ts @@ -35,6 +35,7 @@ peripheral.advertisement = { }; peripheral.connect((error: string): void => {}); peripheral.disconnect((): void => {}); +peripheral.updateRssi((error: string, rssi: number): void => {}); peripheral.discoverServices(["180d"], (error: string, services: noble.Service[]): void => {}); peripheral.discoverAllServicesAndCharacteristics((error: string, services: noble.Service[], characteristics: noble.Characteristic[]): void => {}); peripheral.discoverSomeServicesAndCharacteristics(["180d"], ["2a38"], (error: string, services: noble.Service[], characteristics: noble.Characteristic[]): void => {}); From c10ae26f0a9bd59d62980503eaad69613c793b2a Mon Sep 17 00:00:00 2001 From: Seon-Wook Park Date: Wed, 25 Jun 2014 22:40:55 +0900 Subject: [PATCH 3/4] noble: Respect optional parameters --- noble/noble-tests.ts | 15 +++++++++++++++ noble/noble.d.ts | 15 +++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/noble/noble-tests.ts b/noble/noble-tests.ts index 852174530f..4b1d396564 100644 --- a/noble/noble-tests.ts +++ b/noble/noble-tests.ts @@ -33,11 +33,17 @@ peripheral.advertisement = { manufacturerData: new Buffer(1), serviceUuids: ["0x180a", "0x180d"] }; +peripheral.connect(); peripheral.connect((error: string): void => {}); +peripheral.disconnect(); peripheral.disconnect((): void => {}); +peripheral.updateRssi(); peripheral.updateRssi((error: string, rssi: number): void => {}); +peripheral.discoverServices(["180d"]); peripheral.discoverServices(["180d"], (error: string, services: noble.Service[]): void => {}); +peripheral.discoverAllServicesAndCharacteristics(); peripheral.discoverAllServicesAndCharacteristics((error: string, services: noble.Service[], characteristics: noble.Characteristic[]): void => {}); +peripheral.discoverSomeServicesAndCharacteristics(["180d"], ["2a38"]); peripheral.discoverSomeServicesAndCharacteristics(["180d"], ["2a38"], (error: string, services: noble.Service[], characteristics: noble.Characteristic[]): void => {}); peripheral.readHandle(new Buffer(1), (error: string, data: NodeBuffer): void => {}); peripheral.writeHandle(new Buffer(1), new Buffer(1), true, (error: string): void => {}); @@ -51,7 +57,9 @@ service.uuid = "180a"; service.name = ""; service.type = ""; service.includedServiceUuids = ["180d"]; +service.discoverIncludedServices(["180d"]); service.discoverIncludedServices(["180d"], (error: string, includedServiceUuids: string[]): void => {}); +service.discoverCharacteristics(["2a38"]); service.discoverCharacteristics(["2a38"], (error: string, characteristics: noble.Characteristic[]): void => {}); service.on("includedServicesDiscover", (includedServiceUuids: string[]): void => {}); service.on("characteristicsDiscover", (characteristics: noble.Characteristic[]): void => {}); @@ -61,10 +69,15 @@ characteristic.uuid = "2a37"; characteristic.name = ""; characteristic.type = ""; characteristic.properties = ["read", "notify"]; +characteristic.read(); characteristic.read((error: string, data: NodeBuffer): void => {}); +characteristic.write(new Buffer(1), true); characteristic.write(new Buffer(1), true, (error: string): void => {}); +characteristic.broadcast(true); characteristic.broadcast(true, (error: string): void => {}); +characteristic.notify(true); characteristic.notify(true, (error: string): void => {}); +characteristic.discoverDescriptors(); characteristic.discoverDescriptors((error: string, descriptors: noble.Descriptor[]): void => {}); characteristic.on("read", (data: NodeBuffer, isNotification: boolean): void => {}); characteristic.on("write", true, (error: string): void => {}); @@ -76,7 +89,9 @@ var descriptor: noble.Descriptor = new noble.Descriptor(); descriptor.uuid = ""; descriptor.name = ""; descriptor.type = ""; +descriptor.readValue(); descriptor.readValue((error: string, data: NodeBuffer): void => {}); +descriptor.writeValue(new Buffer(1)); descriptor.writeValue(new Buffer(1), (error: string): void => {}); descriptor.on("valueRead", (error: string, data: NodeBuffer): void => {}); descriptor.on("valueWrite", (error: string): void => {}); diff --git a/noble/noble.d.ts b/noble/noble.d.ts index 3a2765d7b7..554f4a4d25 100644 --- a/noble/noble.d.ts +++ b/noble/noble.d.ts @@ -25,11 +25,17 @@ declare module "noble" { rssi: number; services: string[]; + connect(): void; connect(callback: (error: string) => void): void; + disconnect(): void; disconnect(callback: () => void): void; + updateRssi(): void; updateRssi(callback: (error: string, rssi: number) => void): void; + discoverServices(serviceUUIDs: string[]): void; discoverServices(serviceUUIDs: string[], listener: (error: string, services: Service[]) => void): void; + discoverAllServicesAndCharacteristics(): void; discoverAllServicesAndCharacteristics(callback: (error: string, services: Service[], characteristics: Characteristic[]) => void): void; + discoverSomeServicesAndCharacteristics(serviceUUIDs: string[], characteristicUUIDs: string[]): void; discoverSomeServicesAndCharacteristics(serviceUUIDs: string[], characteristicUUIDs: string[], callback: (error: string, services: Service[], characteristics: Characteristic[]) => void): void; readHandle(handle: NodeBuffer, callback: (error: string, data: NodeBuffer) => void): void; @@ -58,7 +64,9 @@ declare module "noble" { includedServiceUuids: string[]; characteristics: Characteristic[]; + discoverIncludedServices(serviceUUIDs: string[]): void; discoverIncludedServices(serviceUUIDs: string[], callback: (error: string, includedServiceUuids: string[]) => void): void; + discoverCharacteristics(characteristicUUIDs: string[]): void; discoverCharacteristics(characteristicUUIDs: string[], callback: (error: string, characteristics: Characteristic[]) => void): void; toString(): string; @@ -74,10 +82,15 @@ declare module "noble" { properties: string[]; descriptors: Descriptor[]; + read(): void; read(callback: (error: string, data: NodeBuffer) => void): void; + write(data: NodeBuffer, notify: boolean): void; write(data: NodeBuffer, notify: boolean, callback: (error: string) => void): void; + broadcast(broadcast: boolean): void; broadcast(broadcast: boolean, callback: (error: string) => void): void; + notify(notify: boolean): void; notify(notify: boolean, callback: (error: string) => void): void; + discoverDescriptors(): void; discoverDescriptors(callback: (error: string, descriptors: Descriptor[]) => void): void; toString(): string; @@ -95,7 +108,9 @@ declare module "noble" { name: string; type: string; + readValue(): void; readValue(callback: (error: string, data: NodeBuffer) => void): void; + writeValue(data: NodeBuffer): void; writeValue(data: NodeBuffer, callback: (error: string) => void): void; toString(): string; From 7ae6c54d6d5eb0ca95eb06cf4224999101ed72ce Mon Sep 17 00:00:00 2001 From: Seon-Wook Park Date: Thu, 26 Jun 2014 11:48:25 +0900 Subject: [PATCH 4/4] noble: Use less verbose optional parameters syntax --- noble/noble.d.ts | 45 +++++++++++++++------------------------------ 1 file changed, 15 insertions(+), 30 deletions(-) diff --git a/noble/noble.d.ts b/noble/noble.d.ts index 554f4a4d25..fb0a7a491f 100644 --- a/noble/noble.d.ts +++ b/noble/noble.d.ts @@ -25,18 +25,12 @@ declare module "noble" { rssi: number; services: string[]; - connect(): void; - connect(callback: (error: string) => void): void; - disconnect(): void; - disconnect(callback: () => void): void; - updateRssi(): void; - updateRssi(callback: (error: string, rssi: number) => void): void; - discoverServices(serviceUUIDs: string[]): void; - discoverServices(serviceUUIDs: string[], listener: (error: string, services: Service[]) => void): void; - discoverAllServicesAndCharacteristics(): void; - discoverAllServicesAndCharacteristics(callback: (error: string, services: Service[], characteristics: Characteristic[]) => void): void; - discoverSomeServicesAndCharacteristics(serviceUUIDs: string[], characteristicUUIDs: string[]): void; - discoverSomeServicesAndCharacteristics(serviceUUIDs: string[], characteristicUUIDs: string[], callback: (error: string, services: Service[], characteristics: Characteristic[]) => void): void; + connect(callback?: (error: string) => void): void; + disconnect(callback?: () => void): void; + updateRssi(callback?: (error: string, rssi: number) => void): void; + discoverServices(serviceUUIDs: string[], callback?: (error: string, services: Service[]) => void): void; + discoverAllServicesAndCharacteristics(callback?: (error: string, services: Service[], characteristics: Characteristic[]) => void): void; + discoverSomeServicesAndCharacteristics(serviceUUIDs: string[], characteristicUUIDs: string[], callback?: (error: string, services: Service[], characteristics: Characteristic[]) => void): void; readHandle(handle: NodeBuffer, callback: (error: string, data: NodeBuffer) => void): void; writeHandle(handle: NodeBuffer, data: NodeBuffer, withoutResponse: boolean, callback: (error: string) => void): void; @@ -64,10 +58,8 @@ declare module "noble" { includedServiceUuids: string[]; characteristics: Characteristic[]; - discoverIncludedServices(serviceUUIDs: string[]): void; - discoverIncludedServices(serviceUUIDs: string[], callback: (error: string, includedServiceUuids: string[]) => void): void; - discoverCharacteristics(characteristicUUIDs: string[]): void; - discoverCharacteristics(characteristicUUIDs: string[], callback: (error: string, characteristics: Characteristic[]) => void): void; + discoverIncludedServices(serviceUUIDs: string[], callback?: (error: string, includedServiceUuids: string[]) => void): void; + discoverCharacteristics(characteristicUUIDs: string[], callback?: (error: string, characteristics: Characteristic[]) => void): void; toString(): string; on(event: string, listener: Function): events.EventEmitter; @@ -82,16 +74,11 @@ declare module "noble" { properties: string[]; descriptors: Descriptor[]; - read(): void; - read(callback: (error: string, data: NodeBuffer) => void): void; - write(data: NodeBuffer, notify: boolean): void; - write(data: NodeBuffer, notify: boolean, callback: (error: string) => void): void; - broadcast(broadcast: boolean): void; - broadcast(broadcast: boolean, callback: (error: string) => void): void; - notify(notify: boolean): void; - notify(notify: boolean, callback: (error: string) => void): void; - discoverDescriptors(): void; - discoverDescriptors(callback: (error: string, descriptors: Descriptor[]) => void): void; + read(callback?: (error: string, data: NodeBuffer) => void): void; + write(data: NodeBuffer, notify: boolean, callback?: (error: string) => void): void; + broadcast(broadcast: boolean, callback?: (error: string) => void): void; + notify(notify: boolean, callback?: (error: string) => void): void; + discoverDescriptors(callback?: (error: string, descriptors: Descriptor[]) => void): void; toString(): string; on(event: string, listener: Function): events.EventEmitter; @@ -108,10 +95,8 @@ declare module "noble" { name: string; type: string; - readValue(): void; - readValue(callback: (error: string, data: NodeBuffer) => void): void; - writeValue(data: NodeBuffer): void; - writeValue(data: NodeBuffer, callback: (error: string) => void): void; + readValue(callback?: (error: string, data: NodeBuffer) => void): void; + writeValue(data: NodeBuffer, callback?: (error: string) => void): void; toString(): string; on(event: string, listener: Function): events.EventEmitter;