Download image

src/lib/api-uri.ts

@@ -1,6 +1,6 @@
 import path from "path";
 import url from "url";
-import { SKYPEWEB_API_SKYPE_HOST } from "./consts";
+import { SKYPEWEB_API_SKYPE_HOST, SKYPEWEB_CONTACTS_HOST } from "./consts";
 
 export const DEFAULT_USER: string = "self";
 
@@ -29,11 +29,21 @@ function buildContacts(username: string): string[] {
   return buildUser(username).concat("contacts");
 }
 
+// /users/:user/invites
+function buildInvites(username: string): string[] {
+  return buildUser(username).concat("invites");
+}
+
 // /users/:user/contacts/auth-request/:contact
 function buildAuthRequest(username: string, contact: string): string[] {
   return buildContacts(username).concat("auth-request", contact);
 }
 
+// /users/:user/invites/:contact
+function buildInviteRequest(username: string, contact: string): string[] {
+  return buildInvites(username).concat(contact);
+}
+
 // /users/:user/contacts/auth-request/:contact/accept
 function buildAuthRequestAccept(username: string, contact: string): string[] {
   return buildAuthRequest(username, contact).concat("accept");
@@ -44,6 +54,10 @@ function buildAuthRequestDecline(username: string, contact: string): string[] {
   return buildAuthRequest(username, contact).concat("decline");
 }
 
+function buildInviteRequestAccept(username: string, contact: string): string[] {
+  return buildInviteRequest(username, contact).concat("accept");
+}
+
 // /users/:user/displayname
 function buildDisplayName(username: string): string[] {
   return buildUser(username).concat("displayname");
@@ -95,10 +109,18 @@ function getOrigin(): string {
   return "https://" + SKYPEWEB_API_SKYPE_HOST;
 }
 
+function getContact(): string {
+  return `https://${SKYPEWEB_CONTACTS_HOST}`;
+}
+
 function get(p: string) {
   return url.resolve(getOrigin(), p);
 }
 
+function getC(p: string) {
+  return url.resolve(getContact(), p);
+}
+
 export function displayName(username: string): string {
   return get(joinPath(buildDisplayName(username)));
 }
@@ -112,7 +134,7 @@ export function userProfiles(): string {
 }
 
 export function authRequestAccept(username: string, contact: string): string {
-  return get(joinPath(buildAuthRequestAccept(username, contact)));
+  return getC(joinPath(buildInviteRequestAccept(username, contact)));
 }
 
 export function authRequestDecline(username: string, contact: string): string {

src/lib/api.ts

@@ -6,6 +6,7 @@ import { declineContactRequest } from "./api/decline-contact-request";
 import { getContact } from "./api/get-contact";
 import { getConversation } from "./api/get-conversation";
 import { getConversations } from "./api/get-conversations";
+import { getImage } from "./api/get-image";
 import { getJoinUrl } from "./api/get-join-url";
 import { sendImage } from "./api/send-image";
 import { sendMessage } from "./api/send-message";
@@ -17,6 +18,7 @@ import { Contact as _Contact } from "./interfaces/api/contact";
 import { Context as ApiContext } from "./interfaces/api/context";
 import { Conversation } from "./interfaces/api/conversation";
 import * as apiEvents from "./interfaces/api/events";
+import { FileResource } from "./interfaces/api/resources";
 import { HttpIo } from "./interfaces/http-io";
 import { AllUsers } from "./interfaces/native-api/conversation";
 import { MessagesPoller } from "./polling/messages-poller";
@@ -99,6 +101,10 @@ export class Api extends events.EventEmitter implements ApiEvents {
     return sendImage(this.io, this.context, message, conversationId);
   }
 
+  async getMedia(resource: FileResource): Promise<api.MediaDownloaded> {
+    return getImage(this.io, this.context, resource);
+  }
+
   getState(): ApiContext.Json {
     return ApiContext.toJson(this.context);
   }

src/lib/api/accept-contact-request.ts

@@ -4,15 +4,15 @@ import { Context } from "../interfaces/api/context";
 import * as io from "../interfaces/http-io";
 
 export async function acceptContactRequest(io: io.HttpIo, apiContext: Context, contactUsername: string): Promise<void> {
-  const requestOptions: io.GetOptions = {
+  const requestOptions: io.PutOptions = {
     uri: apiUri.authRequestAccept(apiContext.username, contactUsername),
     cookies: apiContext.cookies,
     headers: {
       "X-Skypetoken": apiContext.skypeToken.value,
     },
   };
   const res: io.Response = await io.put(requestOptions);
-  if (res.statusCode !== 201) {
+  if (res.statusCode !== 200) {
     return Promise.reject(new Incident("net", "Failed to accept contact"));
   }
 }

src/lib/api/get-image.ts

@@ -0,0 +1,42 @@
+import { Incident } from "incident";
+import { MediaDownloaded } from "../interfaces/api/api";
+import { Context } from "../interfaces/api/context";
+import { FileResource } from "../interfaces/api/resources";
+import * as io from "../interfaces/http-io";
+
+export async function getImage(
+  io: io.HttpIo,
+  apiContext: Context,
+  messageResource: FileResource,
+): Promise<MediaDownloaded> {
+
+  const originUri: string = messageResource.uri +
+    (messageResource.type === "RichText/UriObject" ?
+    "/views/imgpsh_fullsize" :
+      messageResource.type === "RichText/Media_GenericFile" ?
+        "/views/original" : "");
+
+  if (originUri === messageResource.uri) {
+    return Promise.reject(new Incident("get-media", "Received wrong type of resource file"));
+  }
+
+  const requestOptions: io.GetOptions = {
+    uri: originUri,
+    headers: {
+      Authorization: "skype_token " + apiContext.skypeToken.value,
+    },
+  };
+
+  const res: io.Response = await io.getImageContent(requestOptions);
+
+  if (res.statusCode !== 200) {
+    return Promise.reject(new Incident("get-media", "Received wrong return code"));
+  }
+
+  return {
+    content: res.body,
+    uri_origin: originUri,
+    file_size: parseInt(res.headers["content-length"], 10),
+    original_file_name: messageResource.original_file_name,
+  };
+}

src/lib/api/send-image.ts

@@ -35,6 +35,7 @@ export async function sendImage(
       "Authorization": `skype_token ${apiContext.skypeToken.value}`,
       "Content-Type": "application/json",
       "Content-Length": bodyNewObjectStr.length.toString(10),
+      "X-Client-Version": "0/0.0.0.0",
     },
   };
   const resNewObject: io.Response = await io.post(requestOptionsNewObject);

src/lib/consts.ts

@@ -4,7 +4,7 @@ export const SKYPEWEB_LOCKANDKEY_SECRET: string = "Q1P7W2E4J9R8U3S5";
 export const SKYPEWEB_CLIENTINFO_NAME: string = "skype.com";
 export const SKYPEWEB_CLIENTINFO_VERSION: string = "908/1.30.0.128";
 export const SKYPEWEB_API_SKYPE_HOST: string = "api.skype.com";
-export const SKYPEWEB_CONTACTS_HOST: string = "contacts.skype.com";
+export const SKYPEWEB_CONTACTS_HOST: string = "contacts.skype.com/contacts/v2/";
 export const SKYPEWEB_DEFAULT_MESSAGES_HOST: string = "client-s.gateway.messenger.live.com";
 // tslint:disable-next-line:max-line-length
 export const SKYPEWEB_LOGIN_URL: string = "https://login.skype.com/login?method=skype&client_id=578134&redirect_uri=https%3A%2F%2Fweb.skype.com";

src/lib/interfaces/api/api.ts

@@ -40,3 +40,10 @@ export interface FullId extends ParsedId {
   typeName: string;
   raw: string;
 }
+
+export interface MediaDownloaded {
+  content: string;
+  uri_origin: string;
+  file_size?: number;
+  original_file_name: string;
+}

src/lib/interfaces/http-io.ts

@@ -30,4 +30,6 @@ export interface HttpIo {
   post(options: PostOptions): Promise<Response>;
 
   put(options: PutOptions): Promise<Response>;
+
+  getImageContent(options: GetOptions): Promise<Response>;
 }

src/lib/request-io.ts

@@ -21,6 +21,30 @@ function asRequestOptions(ioOptions: io.GetOptions | io.PostOptions | io.PutOpti
   return result;
 }
 
+export async function getImageContent(options: io.GetOptions): Promise<io.Response> {
+  return new Promise<io.Response>((resolve, reject) => {
+    const requestOptions: request.Options = asRequestOptions(options);
+    requestOptions.encoding = "base64";
+
+    request.get(requestOptions, (error, response, body) => {
+      if (error) {
+        return reject(error);
+      }
+      if (response.statusCode === undefined) {
+        return reject(new Error("Missing status code"));
+      }
+
+      const ioResponse: io.Response = {
+        statusCode: response.statusCode,
+        body,
+        headers: response.headers,
+      };
+
+      resolve(ioResponse);
+    });
+  });
+}
+
 /**
  * Send a GET request
  *
@@ -103,4 +127,5 @@ export const requestIo: io.HttpIo = {
   get,
   post,
   put,
+  getImageContent,
 };