Skip to content
This repository was archived by the owner on Jun 11, 2022. It is now read-only.

Commit 470ca43

Browse files
Crazy-DuckCrazy-Duck
authored
Merge pull request #470 from Arcana/dev
Fix protobufjs breaking update + Greenkeeper integration
2 parents 4840d40 + 6ff0d29 commit 470ca43

20 files changed

+124
-132
lines changed

‎README.hbs

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ node-dota2
44
[![NPM version](https://img.shields.io/npm/v/dota2.svg)](https://npmjs.org/package/dota2 "View this project on NPM")
55
[![Build Status](https://img.shields.io/travis/Arcana/node-dota2.svg)](https://travis-ci.org/Arcana/node-dota2 "View this project's build information")
66
[![Dependency Status](https://img.shields.io/david/Arcana/node-dota2.svg)](https://david-dm.org/Arcana/node-dota2 "Check this project's dependencies")
7+
[![Greenkeeper badge](https://badges.greenkeeper.io/Arcana/node-dota2.svg)](https://greenkeeper.io/)
78

89
A node-steam plugin for Dota 2, consider it in alpha state.
910

‎README.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ node-dota2
44
[![NPM version](https://img.shields.io/npm/v/dota2.svg)](https://npmjs.org/package/dota2 "View this project on NPM")
55
[![Build Status](https://img.shields.io/travis/Arcana/node-dota2.svg)](https://travis-ci.org/Arcana/node-dota2 "View this project's build information")
66
[![Dependency Status](https://img.shields.io/david/Arcana/node-dota2.svg)](https://david-dm.org/Arcana/node-dota2 "Check this project's dependencies")
7+
[![Greenkeeper badge](https://badges.greenkeeper.io/Arcana/node-dota2.svg)](https://greenkeeper.io/)
78

89
A node-steam plugin for Dota 2, consider it in alpha state.
910

@@ -1735,7 +1736,7 @@ Converts a Dota2 account ID to a 64bit Steam ID
17351736
Protobuf schema. See [Protobufjs#Root](http://dcode.io/protobuf.js/Root.html).
17361737
This object can be used to obtain special protobuf types.
17371738
Object types can be created by `Dota2.schema.lookupType("TypeName").encode(payload :Object).finish();`.
1738-
Enum types can be referenced by `Dota2.schema.lookupEnum("EnumName")`, which returns an object array representing the enum.
1739+
Enum types can be referenced by `Dota2.schema.lookupEnum("EnumName").values`, which returns an object array representing the enum.
17391740

17401741
**Kind**: static property of <code>[Dota2](#module_Dota2)</code>
17411742
<a name="module_Dota2.schema.CMsgGCToClientPlayerStatsResponse"></a>

‎handlers/cache.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ var onCacheSubscribed = function onCacheSubscribed(message) {
167167
handleSubscribedType.call(_self, obj.type_id, obj.object_data);
168168
});
169169
};
170-
handlers[Dota2.schema.lookupEnum("ESOMsg").k_ESOMsg_CacheSubscribed] = onCacheSubscribed;
170+
handlers[Dota2.schema.lookupEnum("ESOMsg").values.k_ESOMsg_CacheSubscribed] = onCacheSubscribed;
171171

172172
var onUpdateMultiple = function onUpdateMultiple(message) {
173173
var multi = Dota2.schema.lookup("CMsgSOMultipleObjects").decode(message);
@@ -178,7 +178,7 @@ var onUpdateMultiple = function onUpdateMultiple(message) {
178178
handleSubscribedType.call(_self, obj.type_id, obj.object_data);
179179
});
180180
};
181-
handlers[Dota2.schema.lookupEnum("ESOMsg").k_ESOMsg_UpdateMultiple] = onUpdateMultiple;
181+
handlers[Dota2.schema.lookupEnum("ESOMsg").values.k_ESOMsg_UpdateMultiple] = onUpdateMultiple;
182182

183183
var onCreate = function onCreate(message) {
184184
var single = Dota2.schema.lookup("CMsgSOSingleObject").decode(message);
@@ -189,7 +189,7 @@ var onCreate = function onCreate(message) {
189189
}
190190
handleSubscribedType.call(_self, single.type_id, single.object_data);
191191
}
192-
handlers[Dota2.schema.lookupEnum("ESOMsg").k_ESOMsg_Create] = onCreate;
192+
handlers[Dota2.schema.lookupEnum("ESOMsg").values.k_ESOMsg_Create] = onCreate;
193193

194194
var onCacheUnsubscribed = function onCacheUnsubscribed(message) {
195195
var unsubscribe = Dota2.schema.lookup("CMsgSOCacheUnsubscribed").decode(message);
@@ -211,7 +211,7 @@ var onCacheUnsubscribed = function onCacheUnsubscribed(message) {
211211
this.emit("partyInviteCleared");
212212
}
213213
};
214-
handlers[Dota2.schema.lookupEnum("ESOMsg").k_ESOMsg_CacheUnsubscribed] = onCacheUnsubscribed;
214+
handlers[Dota2.schema.lookupEnum("ESOMsg").values.k_ESOMsg_CacheUnsubscribed] = onCacheUnsubscribed;
215215

216216
var onCacheDestroy = function onCacheDestroy(message) {
217217
var destroy = Dota2.schema.lookup("CMsgSOSingleObject").decode(message);
@@ -228,4 +228,4 @@ var onCacheDestroy = function onCacheDestroy(message) {
228228
this.emit("lobbyInviteCleared");
229229
}
230230
};
231-
handlers[Dota2.schema.lookupEnum("ESOMsg").k_ESOMsg_Destroy] = onCacheDestroy;
231+
handlers[Dota2.schema.lookupEnum("ESOMsg").values.k_ESOMsg_Destroy] = onCacheDestroy;

‎handlers/chat.js

+13-13
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Dota2.Dota2Client.prototype._leaveChatChannelById = function(channelId) {
3030
"channel_id": channelId
3131
};
3232
this.chatChannels = this.chatChannels.filter(item => item.channel_id.notEquals(channelId));
33-
this.sendToGC( Dota2.schema.lookupEnum("EDOTAGCMsg").k_EMsgGCLeaveChatChannel,
33+
this.sendToGC( Dota2.schema.lookupEnum("EDOTAGCMsg").values.k_EMsgGCLeaveChatChannel,
3434
Dota2.schema.lookupType("CMsgDOTALeaveChatChannel").encode(payload).finish());
3535
if (this.debug) {
3636
util.log("Leaving channel " + channelId);
@@ -46,7 +46,7 @@ Dota2.Dota2Client.prototype._leaveChatChannelById = function(channelId) {
4646
* @param {DOTAChatChannelType_t} [channel_type=DOTAChatChannelType_t.DOTAChatChannelType_Custom] - The type of the channel being joined
4747
*/
4848
Dota2.Dota2Client.prototype.joinChat = function(channel_name, channel_type) {
49-
channel_type = channel_type == null ? Dota2.schema.lookupEnum("DOTAChatChannelType_t").DOTAChannelType_Custom : channel_type;
49+
channel_type = channel_type == null ? Dota2.schema.lookupEnum("DOTAChatChannelType_t").values.DOTAChannelType_Custom : channel_type;
5050

5151
/* Attempts to join a chat channel. Expect k_EMsgGCJoinChatChannelResponse from GC */
5252
if (this.debug) util.log("Joining chat channel: " + channel_name);
@@ -55,7 +55,7 @@ Dota2.Dota2Client.prototype.joinChat = function(channel_name, channel_type) {
5555
"channel_name": channel_name,
5656
"channel_type": channel_type
5757
};
58-
this.sendToGC( Dota2.schema.lookupEnum("EDOTAGCMsg").k_EMsgGCJoinChatChannel,
58+
this.sendToGC( Dota2.schema.lookupEnum("EDOTAGCMsg").values.k_EMsgGCJoinChatChannel,
5959
Dota2.schema.lookupType("CMsgDOTAJoinChatChannel").encode(payload).finish());
6060
};
6161

@@ -102,7 +102,7 @@ Dota2.Dota2Client.prototype.sendMessage = function(message, channel_name, channe
102102
"channel_id": cache.channel_id,
103103
"text": message
104104
};
105-
this.sendToGC( Dota2.schema.lookupEnum("EDOTAGCMsg").k_EMsgGCChatMessage,
105+
this.sendToGC( Dota2.schema.lookupEnum("EDOTAGCMsg").values.k_EMsgGCChatMessage,
106106
Dota2.schema.lookupType("CMsgDOTAChatMessage").encode(payload).finish());
107107
};
108108

@@ -132,7 +132,7 @@ Dota2.Dota2Client.prototype.shareLobby = function(channel_name, channel_type) {
132132
"share_lobby_id": this.Lobby.lobby_id,
133133
"share_lobby_passkey": this.Lobby.pass_key
134134
};
135-
this.sendToGC( Dota2.schema.lookupEnum("EDOTAGCMsg").k_EMsgGCChatMessage,
135+
this.sendToGC( Dota2.schema.lookupEnum("EDOTAGCMsg").values.k_EMsgGCChatMessage,
136136
Dota2.schema.lookupType("CMsgDOTAChatMessage").encode(payload).finish());
137137
};
138138

@@ -158,7 +158,7 @@ Dota2.Dota2Client.prototype.flipCoin = function(channel_name, channel_type) {
158158
"channel_id": cache.channel_id,
159159
"coin_flip": true
160160
};
161-
this.sendToGC( Dota2.schema.lookupEnum("EDOTAGCMsg").k_EMsgGCChatMessage,
161+
this.sendToGC( Dota2.schema.lookupEnum("EDOTAGCMsg").values.k_EMsgGCChatMessage,
162162
Dota2.schema.lookupType("CMsgDOTAChatMessage").encode(payload).finish());
163163
};
164164

@@ -189,7 +189,7 @@ Dota2.Dota2Client.prototype.rollDice = function(min, max, channel_name, channel_
189189
"roll_max": max
190190
}
191191
};
192-
this.sendToGC( Dota2.schema.lookupEnum("EDOTAGCMsg").k_EMsgGCChatMessage,
192+
this.sendToGC( Dota2.schema.lookupEnum("EDOTAGCMsg").values.k_EMsgGCChatMessage,
193193
Dota2.schema.lookupType("CMsgDOTAChatMessage").encode(payload).finish());
194194
};
195195

@@ -203,7 +203,7 @@ Dota2.Dota2Client.prototype.requestChatChannels = function() {
203203
if (this.debug) util.log("Requesting channel list");
204204

205205
var payload = {};
206-
this.sendToGC( Dota2.schema.lookupEnum("EDOTAGCMsg").k_EMsgGCRequestChatChannelList,
206+
this.sendToGC( Dota2.schema.lookupEnum("EDOTAGCMsg").values.k_EMsgGCRequestChatChannelList,
207207
Dota2.schema.lookupType("CMsgDOTAChatMessage").encode(payload).finish());
208208
};
209209

@@ -255,7 +255,7 @@ var onJoinChatChannelResponse = function onJoinChatChannelResponse(message) {
255255
this.chatChannels.push(channelData);
256256
this.emit("chatJoined", channelData);
257257
};
258-
handlers[Dota2.schema.lookupEnum("EDOTAGCMsg").k_EMsgGCJoinChatChannelResponse] = onJoinChatChannelResponse;
258+
handlers[Dota2.schema.lookupEnum("EDOTAGCMsg").values.k_EMsgGCJoinChatChannelResponse] = onJoinChatChannelResponse;
259259

260260
var onChatMessage = function onChatMessage(message) {
261261
/* Chat channel message from another user. */
@@ -269,7 +269,7 @@ var onChatMessage = function onChatMessage(message) {
269269
chatData.text,
270270
chatData);
271271
};
272-
handlers[Dota2.schema.lookupEnum("EDOTAGCMsg").k_EMsgGCChatMessage] = onChatMessage;
272+
handlers[Dota2.schema.lookupEnum("EDOTAGCMsg").values.k_EMsgGCChatMessage] = onChatMessage;
273273

274274
var onOtherJoinedChannel = function onOtherJoinedChannel(message) {
275275
/* Someone joined a chat channel you're in. */
@@ -287,7 +287,7 @@ var onOtherJoinedChannel = function onOtherJoinedChannel(message) {
287287
persona_name: otherJoined.persona_name
288288
}));
289289
};
290-
handlers[Dota2.schema.lookupEnum("EDOTAGCMsg").k_EMsgGCOtherJoinedChannel] = onOtherJoinedChannel;
290+
handlers[Dota2.schema.lookupEnum("EDOTAGCMsg").values.k_EMsgGCOtherJoinedChannel] = onOtherJoinedChannel;
291291

292292
var onUserLeftChannel = function onOtherLeftChannel(message) {
293293
/* Someone left a chat channel you're in. */
@@ -320,10 +320,10 @@ var onUserLeftChannel = function onOtherLeftChannel(message) {
320320
}
321321
}
322322
};
323-
handlers[Dota2.schema.lookupEnum("EDOTAGCMsg").k_EMsgGCOtherLeftChannel] = onUserLeftChannel;
323+
handlers[Dota2.schema.lookupEnum("EDOTAGCMsg").values.k_EMsgGCOtherLeftChannel] = onUserLeftChannel;
324324

325325
var onChatChannelsResponse = function onChatChannelsResponse(message) {
326326
var channels = Dota2.schema.lookupType("CMsgDOTARequestChatChannelListResponse").decode(message).channels;
327327
this.emit("chatChannelsData", channels)
328328
};
329-
handlers[Dota2.schema.lookupEnum("EDOTAGCMsg").k_EMsgGCRequestChatChannelListResponse] = onChatChannelsResponse;
329+
handlers[Dota2.schema.lookupEnum("EDOTAGCMsg").values.k_EMsgGCRequestChatChannelListResponse] = onChatChannelsResponse;

‎handlers/community.js

+12-12
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ Dota2.Dota2Client.prototype.requestPlayerMatchHistory = function(account_id, opt
3838
payload.account_id = account_id;
3939
payload.matches_requested = payload.matches_requested || 1;
4040
payload.request_id = payload.request_id || account_id;
41-
this.sendToGC( Dota2.schema.lookupEnum("EDOTAGCMsg").k_EMsgDOTAGetPlayerMatchHistory,
41+
this.sendToGC( Dota2.schema.lookupEnum("EDOTAGCMsg").values.k_EMsgDOTAGetPlayerMatchHistory,
4242
Dota2.schema.lookupType("CMsgDOTAGetPlayerMatchHistory").encode(payload).finish(),
4343
onPlayerMatchHistoryResponse, callback);
4444
};
@@ -63,7 +63,7 @@ Dota2.Dota2Client.prototype.requestProfileCard = function(account_id, callback)
6363
var payload = {
6464
"account_id": account_id
6565
};
66-
this.sendToGC( Dota2.schema.lookupEnum("EDOTAGCMsg").k_EMsgClientToGCGetProfileCard,
66+
this.sendToGC( Dota2.schema.lookupEnum("EDOTAGCMsg").values.k_EMsgClientToGCGetProfileCard,
6767
Dota2.schema.lookupType("CMsgClientToGCGetProfileCard").encode(payload).finish(),
6868
onProfileCardResponse, callback);
6969
};
@@ -87,7 +87,7 @@ Dota2.Dota2Client.prototype.requestHallOfFame = function(week, callback) {
8787
var payload = {
8888
"week": week
8989
};
90-
this.sendToGC( Dota2.schema.lookupEnum("EDOTAGCMsg").k_EMsgGCHallOfFameRequest,
90+
this.sendToGC( Dota2.schema.lookupEnum("EDOTAGCMsg").values.k_EMsgGCHallOfFameRequest,
9191
Dota2.schema.lookupType("CMsgDOTAHallOfFameRequest").encode(payload).finish(),
9292
onHallOfFameResponse, callback);
9393
};
@@ -115,7 +115,7 @@ Dota2.Dota2Client.prototype.requestPlayerInfo = function(account_ids) {
115115
var payload = {
116116
player_infos: account_ids
117117
};
118-
this.sendToGC( Dota2.schema.lookupEnum("EDOTAGCMsg").k_EMsgGCPlayerInfoRequest,
118+
this.sendToGC( Dota2.schema.lookupEnum("EDOTAGCMsg").values.k_EMsgGCPlayerInfoRequest,
119119
Dota2.schema.lookupType("CMsgGCPlayerInfoRequest").encode(payload).finish());
120120
};
121121

@@ -137,7 +137,7 @@ Dota2.Dota2Client.prototype.requestTrophyList = function(account_id, callback) {
137137
var payload = {
138138
"account_id": account_id
139139
};
140-
this.sendToGC( Dota2.schema.lookupEnum("EDOTAGCMsg").k_EMsgClientToGCGetTrophyList,
140+
this.sendToGC( Dota2.schema.lookupEnum("EDOTAGCMsg").values.k_EMsgClientToGCGetTrophyList,
141141
Dota2.schema.lookupType("CMsgClientToGCGetTrophyList").encode(payload).finish(),
142142
onTrophyListResponse, callback);
143143
};
@@ -161,7 +161,7 @@ Dota2.Dota2Client.prototype.requestPlayerStats = function(account_id, callback)
161161
var payload = {
162162
"account_id": account_id
163163
};
164-
this.sendToGC( Dota2.schema.lookupEnum("EDOTAGCMsg").k_EMsgClientToGCPlayerStatsRequest,
164+
this.sendToGC( Dota2.schema.lookupEnum("EDOTAGCMsg").values.k_EMsgClientToGCPlayerStatsRequest,
165165
Dota2.schema.lookupType("CMsgClientToGCPlayerStatsRequest").encode(payload).finish(),
166166
onPlayerStatsResponse, callback);
167167
}
@@ -272,7 +272,7 @@ var onPlayerMatchHistoryResponse = function onPlayerMatchHistoryResponse(message
272272
if (callback) callback(matchHistoryResponse.result, matchHistoryResponse);
273273
}
274274
};
275-
handlers[Dota2.schema.lookupEnum("EDOTAGCMsg").k_EMsgDOTAGetPlayerMatchHistoryResponse] = onPlayerMatchHistoryResponse;
275+
handlers[Dota2.schema.lookupEnum("EDOTAGCMsg").values.k_EMsgDOTAGetPlayerMatchHistoryResponse] = onPlayerMatchHistoryResponse;
276276

277277
var onProfileCardResponse = function onProfileCardResponse(message, callback) {
278278
callback = callback || null;
@@ -282,7 +282,7 @@ var onProfileCardResponse = function onProfileCardResponse(message, callback) {
282282
this.emit("profileCardData", profileCardResponse.account_id, profileCardResponse);
283283
if (callback) callback(null, profileCardResponse);
284284
};
285-
handlers[Dota2.schema.lookupEnum("EDOTAGCMsg").k_EMsgClientToGCGetProfileCardResponse] = onProfileCardResponse;
285+
handlers[Dota2.schema.lookupEnum("EDOTAGCMsg").values.k_EMsgClientToGCGetProfileCardResponse] = onProfileCardResponse;
286286

287287
var onHallOfFameResponse = function onHallOfFameResponse(message, callback) {
288288
callback = callback || null;
@@ -297,15 +297,15 @@ var onHallOfFameResponse = function onHallOfFameResponse(message, callback) {
297297
if (callback) callback(hallOfFameResponse.result, hallOfFameResponse);
298298
}
299299
};
300-
handlers[Dota2.schema.lookupEnum("EDOTAGCMsg").k_EMsgGCHallOfFameResponse] = onHallOfFameResponse;
300+
handlers[Dota2.schema.lookupEnum("EDOTAGCMsg").values.k_EMsgGCHallOfFameResponse] = onHallOfFameResponse;
301301

302302
var onPlayerInfoResponse = function onPlayerInfoResponse(message) {
303303
var playerInfoResponse = Dota2.schema.lookupType("CMsgGCPlayerInfo").decode(message);
304304

305305
if (this.debug) util.log("Received new player info data");
306306
this.emit("playerInfoData", playerInfoResponse);
307307
};
308-
handlers[Dota2.schema.lookupEnum("EDOTAGCMsg").k_EMsgGCPlayerInfo] = onPlayerInfoResponse;
308+
handlers[Dota2.schema.lookupEnum("EDOTAGCMsg").values.k_EMsgGCPlayerInfo] = onPlayerInfoResponse;
309309

310310
var onTrophyListResponse = function onTrophyListResponse(message, callback) {
311311
var trophyListResponse = Dota2.schema.lookupType("CMsgClientToGCGetTrophyListResponse").decode(message);
@@ -314,7 +314,7 @@ var onTrophyListResponse = function onTrophyListResponse(message, callback) {
314314
this.emit("trophyListData", trophyListResponse);
315315
if (callback) callback(null, trophyListResponse);
316316
};
317-
handlers[Dota2.schema.lookupEnum("EDOTAGCMsg").k_EMsgClientToGCGetTrophyListResponse] = onTrophyListResponse;
317+
handlers[Dota2.schema.lookupEnum("EDOTAGCMsg").values.k_EMsgClientToGCGetTrophyListResponse] = onTrophyListResponse;
318318

319319
var onPlayerStatsResponse = function onPlayerStatsResponse(message, callback) {
320320
var playerStatsResponse = Dota2.schema.lookupType("CMsgGCToClientPlayerStatsResponse").decode(message);
@@ -324,4 +324,4 @@ var onPlayerStatsResponse = function onPlayerStatsResponse(message, callback) {
324324
if (callback) callback(null, playerStatsResponse);
325325

326326
};
327-
handlers[Dota2.schema.lookupEnum("EDOTAGCMsg").k_EMsgGCToClientPlayerStatsResponse] = onPlayerStatsResponse;
327+
handlers[Dota2.schema.lookupEnum("EDOTAGCMsg").values.k_EMsgGCToClientPlayerStatsResponse] = onPlayerStatsResponse;

‎handlers/custom.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Dota2.Dota2Client.prototype.requestJoinableCustomGameModes = function requestJoi
1515
var payload = {
1616
"server_region": server_region
1717
};
18-
this.sendToGC( Dota2.schema.lookupEnum("EDOTAGCMsg").k_EMsgGCJoinableCustomGameModesRequest,
18+
this.sendToGC( Dota2.schema.lookupEnum("EDOTAGCMsg").values.k_EMsgGCJoinableCustomGameModesRequest,
1919
Dota2.schema.lookupType("CMsgJoinableCustomGameModesRequest").encode(payload).finish());
2020
}
2121

@@ -35,4 +35,4 @@ var onJoinableCustomGameModesResponse = function onJoinableCustomGameModesRespon
3535
if (this.debug) util.log("Received joinable custom game modes");
3636
this.emit("joinableCustomGameModes", modes.game_modes);
3737
};
38-
handlers[Dota2.schema.lookupEnum("EDOTAGCMsg").k_EMsgGCJoinableCustomGameModesResponse] = onJoinableCustomGameModesResponse;
38+
handlers[Dota2.schema.lookupEnum("EDOTAGCMsg").values.k_EMsgGCJoinableCustomGameModesResponse] = onJoinableCustomGameModesResponse;

0 commit comments

Comments
 (0)