Skip to content

Commit 3229750

Browse files
committedNov 21, 2014
tidied up TypeScript references
1 parent f5346c0 commit 3229750

17 files changed

+117
-237
lines changed
 

‎.gitignore

+5
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
*.config
2828
ipch/
2929
obj/
30+
Scripts/
3031
[Bb]in
3132
[Dd]ebug*/
3233
[Rr]elease*/
@@ -35,6 +36,10 @@ Ankh.NoLoad
3536
*.js.map
3637
*.csproj
3738
*.csproj.user
39+
*.njsproj
40+
*.njsproj.user
41+
*.dat
42+
*.sln
3843

3944
#MonoDevelop
4045
*.pidb

‎easy-sqs.sln

+8-6
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,20 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 2012
4-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "easy-sqs", "easy-sqs.csproj", "{15B9DC44-097F-4A9B-802C-6DAAC9B76329}"
3+
# Visual Studio 2013
4+
VisualStudioVersion = 12.0.31101.0
5+
MinimumVisualStudioVersion = 10.0.40219.1
6+
Project("{9092AA53-FB77-4645-B42D-1CCCA6BD08BD}") = "easy-sqs", "easy-sqs.njsproj", "{12F47C22-8B0F-418A-A2D9-56720706AB89}"
57
EndProject
68
Global
79
GlobalSection(SolutionConfigurationPlatforms) = preSolution
810
Debug|Any CPU = Debug|Any CPU
911
Release|Any CPU = Release|Any CPU
1012
EndGlobalSection
1113
GlobalSection(ProjectConfigurationPlatforms) = postSolution
12-
{15B9DC44-097F-4A9B-802C-6DAAC9B76329}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
13-
{15B9DC44-097F-4A9B-802C-6DAAC9B76329}.Debug|Any CPU.Build.0 = Debug|Any CPU
14-
{15B9DC44-097F-4A9B-802C-6DAAC9B76329}.Release|Any CPU.ActiveCfg = Release|Any CPU
15-
{15B9DC44-097F-4A9B-802C-6DAAC9B76329}.Release|Any CPU.Build.0 = Release|Any CPU
14+
{12F47C22-8B0F-418A-A2D9-56720706AB89}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
15+
{12F47C22-8B0F-418A-A2D9-56720706AB89}.Debug|Any CPU.Build.0 = Debug|Any CPU
16+
{12F47C22-8B0F-418A-A2D9-56720706AB89}.Release|Any CPU.ActiveCfg = Release|Any CPU
17+
{12F47C22-8B0F-418A-A2D9-56720706AB89}.Release|Any CPU.Build.0 = Release|Any CPU
1618
EndGlobalSection
1719
GlobalSection(SolutionProperties) = preSolution
1820
HideSolutionNode = FALSE

‎lib/CustomErrors.js

+1-8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎lib/EasyQueueReader.js

+3-41
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎lib/EasyQueueReader.ts

-7
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
/// <reference path="./imports.d.ts" />
2-
31
import AWS = require("aws-sdk");
42
import errors = require("./CustomErrors");
53

@@ -167,8 +165,6 @@ export class MessageDeleter implements IMessageDeleter {
167165
me.recieptLog.push(value);
168166
});
169167

170-
//console.log("log", this.recieptLog.length);
171-
172168
me.flushIfThresholdExceeded();
173169
}
174170

@@ -180,7 +176,6 @@ export class MessageDeleter implements IMessageDeleter {
180176
public flush() {
181177

182178
if (this.recieptLog.length > 0) {
183-
//console.log("flushing!");
184179
this.cleanUp(this.sqs, this);
185180
}
186181
}
@@ -213,8 +208,6 @@ export class MessageDeleter implements IMessageDeleter {
213208

214209
private deleteMessageBatch(client: AWS.Sqs.Client, queueName: string, handles: string[]) {
215210

216-
//console.log("preparing batch", handles.length);
217-
218211
var entries: AWS.Sqs.DeleteMessageBatchRequestEntry[] = [];
219212
var me = this;
220213

‎lib/EasySqs.js

+1-21
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎lib/EasySqs.ts

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
/// <reference path="./imports.d.ts" />
2-
31
import AWS = require("aws-sdk");
42
import reader = require("./EasyQueueReader");
53
import errors = require("./CustomErrors");

‎lib/Helpers/TestHelper.js

+7-11
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎lib/Helpers/TestHelper.ts

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
///<reference path="../imports.d.ts"/>
2-
31
import errors = require("../CustomErrors");
42

53
export function nullErrorTest(test: nodeunit.Test, fnc: () => void) {

‎lib/Tests/EasySqs-test.js

+1-40
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎lib/Tests/EasySqs-test.ts

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
///<reference path="../imports.d.ts"/>
2-
31
import easy = require("../EasySqs");
42
import sdk = require("aws-sdk");
53
import help = require("../Helpers/TestHelper");

‎lib/Tests/index-test.js

+1-22
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎lib/Tests/index-test.ts

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
///<reference path="../imports.d.ts"/>
2-
31
import easy = require("../EasySqs");
42
import lib = require("../index");
53
import sdk = require("aws-sdk");

‎lib/easySqs.d.ts

+86-42
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,90 @@
1+
//declare module "easy-sqs" {
2+
// import AWS = require("aws-sdk");
13

2-
declare module "easy-sqs" {
4+
// export function CreateClient(accessKey: string, secretKey: string, region: string): ISqsClient;
5+
// export interface ISqsClient {
6+
// getQueue(queueUrl: string, callback: (err: Error, queue: IQueue) => void): any;
7+
// createQueue(queueName: string, options: ICreateQueueOptions, callback: (err: Error, queue: IQueue) => void): any;
8+
// }
9+
// export interface ICreateQueueOptions {
10+
// DelaySeconds?: number;
11+
// MaximumMessageSize?: number;
12+
// MessageRetentionPeriod?: number;
13+
// ReceiveMessageWaitTimeSeconds?: number;
14+
// VisibilityTimeout?: number;
15+
// }
16+
// export class SqsClient implements ISqsClient {
17+
// private accessKey;
18+
// private secretKey;
19+
// private region;
20+
// private sqs;
21+
// constructor(service: AWS.SQS);
22+
// public getQueue(queueUrl: string, callback: (err: Error, queue: IQueue) => void): void;
23+
// public createQueue(queueName: string, options: ICreateQueueOptions, callback: (err: Error, queue: IQueue) => void): void;
24+
// }
325

4-
import AWS = require("aws-sdk");
5-
6-
export function CreateClient(accessKey: string, secretKey: string, region: string): ISqsClient;
726

8-
export interface IQueue {
9-
queueName: string;
10-
getMessage(callback: (err: Error, data: AWS.Sqs.Message) => void);
11-
deleteMessage(msg: AWS.Sqs.Message, callback: (err: Error) => void);
12-
sendMessage(data: string, callback: (err: Error) => void);
13-
createQueueReader(): IQueueReader;
14-
drain(callback?: (err:Error) => void);
15-
}
27+
// export interface IQueueReader {
28+
// onReceipt(callback: (err: any, messages: AWS.Sqs.Message[], context: IMessageDeleter) => void): any;
29+
// onEmpty(callback: (err: any) => void): any;
30+
// start(): any;
31+
// stop(): any;
32+
// receiptCallback: (err: Error, messages: AWS.Sqs.Message[], context: IMessageDeleter) => void;
33+
// emptyCallback: (err: Error) => void;
34+
// errorHandler: (err: Error) => void;
35+
// }
36+
// export interface IMessageDeleter {
37+
// deleteMessage(message: AWS.Sqs.Message): any;
38+
// deleteMessages(messages: AWS.Sqs.Message[]): any;
39+
// }
40+
// export class QueueReader implements IQueueReader {
41+
// public receiptCallback: (err: Error, messages: AWS.Sqs.Message[], context: IMessageDeleter) => void;
42+
// public emptyCallback: (err: Error) => void;
43+
// public errorHandler: (err: Error) => void;
44+
// private sqs;
45+
// private queueName;
46+
// public batchSize: number;
47+
// private listening;
48+
// constructor(sqs: AWS.SQS, queueName: string, batchSize?: number);
49+
// public onReceipt(callback: (err: Error, messages: AWS.Sqs.Message[], context: IMessageDeleter) => void): IQueueReader;
50+
// public onEmpty(callback: (err: Error) => void): IQueueReader;
51+
// public onError(callback: (err: Error) => void): IQueueReader;
52+
// public start(): void;
53+
// private checkEventsAreSetupCorrectly();
54+
// public stop(): void;
55+
// private internalMonitorQueue(deleter);
56+
// }
57+
// export class MessageDeleter implements IMessageDeleter {
58+
// private recieptLog;
59+
// private threshold;
60+
// private queueName;
61+
// private sqs;
62+
// private errorHandler;
63+
// constructor(sqs: AWS.SQS, queueName: string, batchSize: number, errorHandler: (err: Error) => void);
64+
// public deleteMessage(message: AWS.Sqs.Message): void;
65+
// public deleteMessages(messages: AWS.Sqs.Message[]): void;
66+
// private flushIfThresholdExceeded();
67+
// public flush(): void;
68+
// private cleanUp(client, parent);
69+
// private deleteMessageBatch(client, queueName, handles);
70+
// }
1671

17-
export interface IQueueReader {
18-
onReceipt(callback: (err, messages: AWS.Sqs.Message[], context: IMessageDeleter) => void);
19-
onEmpty(callback: (err) => void);
20-
start();
21-
stop();
22-
receiptCallback: (err: Error, messages: AWS.Sqs.Message[], context: IMessageDeleter) => void;
23-
emptyCallback: (err: Error) => void;
24-
errorHandler: (err: Error) => void;
25-
26-
}
27-
28-
export interface ICreateQueueOptions {
29-
DelaySeconds?: number;
30-
MaximumMessageSize?: number;
31-
MessageRetentionPeriod?: number;
32-
ReceiveMessageWaitTimeSeconds?: number;
33-
VisibilityTimeout?: number;
34-
}
35-
36-
export interface ISqsClient {
37-
getQueue(queueUrl: string, callback: (err: Error, queue: IQueue) => void);
38-
createQueue(queueName: string, options: ICreateQueueOptions, callback: (err: Error, queue: IQueue) => void);
39-
}
40-
41-
export interface IMessageDeleter {
42-
deleteMessage(message: AWS.Sqs.Message);
43-
deleteMessages(messages: AWS.Sqs.Message[]);
44-
}
45-
46-
}
72+
// export interface IQueue {
73+
// queueName: string;
74+
// getMessage(callback: (err: Error, data: AWS.Sqs.Message) => void): any;
75+
// deleteMessage(msg: AWS.Sqs.Message, callback: (err: Error) => void): any;
76+
// sendMessage(data: string, callback: (err: Error) => void): any;
77+
// createQueueReader(): IQueueReader;
78+
// drain(callback?: (err: Error) => void): any;
79+
// }
80+
// export class Queue implements IQueue {
81+
// public queueName: string;
82+
// private sqs;
83+
// constructor(queueName: string, sqs: AWS.SQS);
84+
// public createQueueReader(): IQueueReader;
85+
// public drain(callback?: (err: Error) => void): void;
86+
// public getMessage(callback: (err: Error, data: AWS.Sqs.Message) => void): void;
87+
// public deleteMessage(msg: AWS.Sqs.Message, callback: (err: Error) => void): void;
88+
// public sendMessage(data: string, callback: (err: Error) => void): void;
89+
// }
90+
//}

‎lib/imports.d.ts

-5
This file was deleted.

‎lib/index.js

+4-24
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎lib/index.ts

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
/// <reference path="./imports.d.ts" />
2-
31
import AWS = require("aws-sdk");
42
import easySqs = require("./EasySqs");
53

0 commit comments

Comments
 (0)
Please sign in to comment.