Skip to content

Commit

Permalink
Merge pull request Azure#88 from amarzavery/sendpart
Browse files Browse the repository at this point in the history
Moving to amqp-common and updated structure of rhea-promise
  • Loading branch information
amarzavery authored Jul 12, 2018
2 parents c87ec55 + 35aa6c7 commit 12c35b4
Show file tree
Hide file tree
Showing 84 changed files with 5,686 additions and 2,939 deletions.
7 changes: 6 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,10 @@ node_modules
# WebStorm
.idea

# coverage #
.nyc_output
coverage

# Mac OS #
.DS_Store
.DS_Store?
Expand All @@ -51,4 +55,5 @@ typings/
dist/
output/
client/examples/js/lib/
processor/examples/js/lib/
processor/examples/js/lib/
typedoc
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ language: node_js

node_js:
- "8"
- "10"

before_install:
- cd client
Expand Down
10 changes: 5 additions & 5 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"type": "node",
"request": "launch",
"name": "EPH Tests",
"program": "${workspaceFolder}/node_modules/mocha/bin/_mocha",
"program": "${workspaceFolder}/processor/node_modules/mocha/bin/_mocha",
"args": [
"-u",
"tdd",
Expand All @@ -26,7 +26,7 @@
"type": "node",
"request": "launch",
"name": "Client Tests",
"program": "${workspaceFolder}/node_modules/mocha/bin/_mocha",
"program": "${workspaceFolder}/client/node_modules/mocha/bin/_mocha",
"args": [
"-u",
"tdd",
Expand All @@ -44,9 +44,9 @@
"type": "node",
"request": "launch",
"name": "Client Example",
"program": "${workspaceFolder}/client/examples/simpleSendReceive.ts",
"program": "${workspaceFolder}/client/examples/simpleSender.ts",
"outFiles": [
"${workspaceFolder}/dist/**/*.js"
"${workspaceFolder}/client/dist/**/*.js"
],
"envFile": "${workspaceFolder}/client/.env" // You can take a look at the sample.env file for supported environment variables.
},
Expand All @@ -56,7 +56,7 @@
"name": "EPH Example",
"program": "${workspaceFolder}/processor/examples/eph.ts",
"outFiles": [
"${workspaceFolder}/dist/**/*.js"
"${workspaceFolder}/processor/dist/**/*.js"
],
"envFile": "${workspaceFolder}/processor/.env" // You can take a look at the sample.env file for supported environment variables.
},
Expand Down
4 changes: 4 additions & 0 deletions client/.npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -41,3 +41,7 @@ webpack.config.ts
.idea/
changelog.md
samples/
typings/examples/
dist/examples/
docs/
typedoc/
2 changes: 1 addition & 1 deletion client/examples/batchReceive.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { EventHubClient, EventData } from "azure-event-hubs";
import { EventHubClient, EventData } from "../lib";
import * as dotenv from "dotenv";
dotenv.config();

Expand Down
4 changes: 2 additions & 2 deletions client/examples/batchSendReceive.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { EventHubClient, EventData, EventPosition, OnMessage, OnError, EventHubsError } from "azure-event-hubs";
import { EventHubClient, EventData, EventPosition, OnMessage, OnError, MessagingError } from "../lib";
import * as dotenv from "dotenv";
dotenv.config();

Expand All @@ -21,7 +21,7 @@ async function main(): Promise<void> {
client.close();
}
}
const onError: OnError = (err: EventHubsError | Error) => {
const onError: OnError = (err: MessagingError | Error) => {
console.log(">>>>> Error occurred: ", err);
};
client.receive("0", onMessage, onError, { eventPosition: EventPosition.fromEnqueuedTime(Date.now()) });
Expand Down
6 changes: 3 additions & 3 deletions client/examples/createEpochReceiver.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { EventHubClient, OnError, EventHubsError, OnMessage, delay } from "azure-event-hubs";
import { EventHubClient, OnError, MessagingError, OnMessage, delay } from "../lib";
import * as dotenv from "dotenv";
dotenv.config();

Expand All @@ -16,7 +16,7 @@ async function main(): Promise<void> {
console.log(">>> EventDataObject: ", eventData);
console.log("### Actual message:", eventData.body ? eventData.body.toString() : null);
}
const onError: OnError = (err: EventHubsError | Error) => {
const onError: OnError = (err: MessagingError | Error) => {
console.log("@@@@ receiver with epoch 2.");
console.log(">>>>> Error occurred for receiver with epoch 2: ", err);
};
Expand All @@ -29,7 +29,7 @@ async function main(): Promise<void> {
console.log(">>> EventDataObject: ", eventData);
console.log("### Actual message:", eventData.body ? eventData.body.toString() : null);
}
const onError2: OnError = (err: EventHubsError | Error) => {
const onError2: OnError = (err: MessagingError | Error) => {
console.log("@@@@ receiver with epoch 1.");
console.log(">>>>> Error occurred for receiver with epoch 1: ", err);
};
Expand Down
2 changes: 1 addition & 1 deletion client/examples/getHubRuntimeInfo.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { EventHubClient } from "azure-event-hubs";
import { EventHubClient } from "../lib";
import * as dotenv from "dotenv";
dotenv.config();

Expand Down
2 changes: 1 addition & 1 deletion client/examples/iotGetHubRuntimeInfo.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { EventHubClient } from "azure-event-hubs";
import { EventHubClient } from "../lib";
import * as dotenv from "dotenv";
dotenv.config();

Expand Down
30 changes: 0 additions & 30 deletions client/examples/js/examples/batchReceive.js

This file was deleted.

48 changes: 0 additions & 48 deletions client/examples/js/examples/batchSendReceive.js

This file was deleted.

47 changes: 0 additions & 47 deletions client/examples/js/examples/createEpochReceiver.js

This file was deleted.

29 changes: 0 additions & 29 deletions client/examples/js/examples/getHubRuntimeInfo.js

This file was deleted.

26 changes: 0 additions & 26 deletions client/examples/js/examples/iotGetHubRuntimeInfo.js

This file was deleted.

32 changes: 0 additions & 32 deletions client/examples/js/examples/sendReceiveWithInteractiveAuth.js

This file was deleted.

35 changes: 0 additions & 35 deletions client/examples/js/examples/sendReceiveWithSPAuth.js

This file was deleted.

Loading

0 comments on commit 12c35b4

Please sign in to comment.