diff --git a/types/zetapush-js/index.d.ts b/types/zetapush-js/index.d.ts
new file mode 100644
index 0000000000..afe0e3c6b0
--- /dev/null
+++ b/types/zetapush-js/index.d.ts
@@ -0,0 +1,187 @@
+// Type definitions for zetapush-js 3.1
+// Project: https://github.com/zetapush/zetapush-js
+// Definitions by: ghoullier <https://github.com/ghoullier>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export interface HandshakeFields {
+  ext: any;
+}
+
+export interface AbstractHandshakeOptions {
+  authType: string;
+  sandboxId: string;
+  deploymentId: string;
+}
+
+export interface CredentialsHandshakeOptions {
+  authType: string;
+  deploymentId: string;
+  login: string;
+  password: string;
+}
+
+export interface TokenHandshakeOptions {
+  authType: string;
+  deploymentId: string;
+  token: string;
+}
+
+export interface AbstractHandshake {
+  authType: string;
+  authVersion: string;
+  sandboxId: string;
+  deploymentId: string;
+  getHandshakeFields(client: Client): HandshakeFields;
+}
+
+export interface CredentialsAuthData {
+  login: string;
+  password: string;
+}
+
+export interface CredentialsHandshake extends AbstractHandshake {
+  login: string;
+  password: string;
+  authData: CredentialsAuthData;
+}
+
+export interface TokenAuthData {
+  token: string;
+}
+
+export interface TokenHandshake extends AbstractHandshake {
+  token: string;
+  authData: TokenAuthData;
+}
+
+export type AuthenticationCallback = () => AbstractHandshake;
+
+export type AsyncMacroServicePublisher = (method: string, parameters: any, hardFail?: boolean, debug?: number) => Promise<any>;
+
+export type MacroServicePublisher = (method: string, parameters: any, hardFail?: boolean, debug?: number) => void;
+
+export type ServicePublisher = (method: string, parameters: any) => void;
+
+export interface Options {
+  apiUrl?: string;
+  sandboxId: string;
+  forceHttps?: boolean;
+  resource?: string;
+  transports?: any[];
+}
+
+export interface ClientOptions extends Options {
+  authentication(): AbstractHandshake;
+}
+
+export interface WeakClientOptions extends Options {
+  deploymentId?: string;
+}
+
+export interface Services {
+  Macro: AsyncMacroService;
+  Messaging: Service;
+}
+
+export interface Service {
+  DEFAULT_DEPLOYMENT_ID: string;
+  $publish: ServicePublisher;
+}
+
+export interface AsyncMacroService {
+  DEFAULT_DEPLOYMENT_ID: string;
+  $publish: AsyncMacroServicePublisher;
+}
+
+export interface MacroService {
+  DEFAULT_DEPLOYMENT_ID: string;
+  $publish: MacroServicePublisher;
+}
+
+export interface ServiceDeclaration {
+  Type: Service;
+  deploymentId?: string;
+}
+
+export interface Token {
+  token: string;
+}
+
+export interface Credentials {
+  login: string;
+  password: string;
+}
+
+export interface ClientHelper {
+  authentication: AuthenticationCallback;
+  servers: Promise<string[]>;
+  getUniqRequestId(): string;
+}
+
+export type ConnectionStatusHandler = number;
+
+export class Authentication {
+  static delegating({ token }: TokenAuthData): TokenHandshake;
+  static simple({ login, password }: CredentialsAuthData): CredentialsHandshake;
+  static weak({ token }: TokenAuthData): TokenHandshake;
+}
+
+export interface ConnectionStatusListener {
+  onConnectionBroken(): void;
+  onConnectionClosed(): void;
+  onConnectionEstablished(): void;
+  onConnectionToServerFail(failure: any): void;
+  onConnectionWillClose(): void;
+  onFailedHandshake(failure: any): void;
+  onMessageLost(): void;
+  onNoServerUrlAvailable(): void;
+  onSuccessfulHandshake(authentication: any): void;
+}
+
+export class Client {
+  helper: ClientHelper;
+  constructor(options: ClientOptions);
+  addConnectionStatusListener(listener: ConnectionStatusListener): ConnectionStatusHandler;
+  connect(): void;
+  createService(declaration: ServiceDeclaration): Service;
+  createAsyncMacroService(declaration: ServiceDeclaration): AsyncMacroService;
+  disconnect(): void;
+  isConnected(): boolean;
+  getSandboxId(): string;
+  getResource(): string;
+  getUserId(): string;
+  removeConnectionStatusListener(listener: ConnectionStatusHandler): void;
+  setAuthentication(authentication: AuthenticationCallback): void;
+  setLogLevel(level: string): void;
+  setResource(resource: string): void;
+  unsubscribe(service: Service): void;
+  //
+  onConnectionBroken(handler: () => void): void;
+  onConnectionClosed(handler: () => void): void;
+  onConnectionEstablished(handler: () => void): void;
+  onConnectionToServerFail(handler: (failure: any) => void): void;
+  onConnectionWillClose(handler: () => void): void;
+  onFailedHandshake(handler: (failure: any) => void): void;
+  onMessageLost(handler: () => void): void;
+  onNoServerUrlAvailable(handler: () => void): void;
+  onSuccessfulHandshake(handler: (authentication: any) => void): void;
+}
+
+export class SmartClient extends Client {
+  getCredentials(): any;
+  getSession(): any;
+  hasCredentials(): boolean;
+  isStronglyAuthenticated(session?: any): boolean;
+  isWeaklyAuthenticated(session?: any): boolean;
+  setCredentials(credentials: any): void;
+}
+export class WeakClient extends Client {
+  constructor(options: WeakClientOptions);
+  getToken(): Token;
+}
+
+export const services: Services;
+
+export const VERSION: string;
+
+export as namespace ZetaPush;
diff --git a/types/zetapush-js/tsconfig.json b/types/zetapush-js/tsconfig.json
new file mode 100644
index 0000000000..78526186fb
--- /dev/null
+++ b/types/zetapush-js/tsconfig.json
@@ -0,0 +1,22 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "zetapush-js-tests.ts"
+    ]
+}
diff --git a/types/zetapush-js/tslint.json b/types/zetapush-js/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/zetapush-js/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/zetapush-js/zetapush-js-tests.ts b/types/zetapush-js/zetapush-js-tests.ts
new file mode 100644
index 0000000000..46eb822680
--- /dev/null
+++ b/types/zetapush-js/zetapush-js-tests.ts
@@ -0,0 +1,23 @@
+import { Authentication, Client, WeakClient } from 'zetapush-js';
+
+const weak = new WeakClient({
+  sandboxId: ''
+});
+
+weak.onConnectionEstablished(() => {
+  // onConnectionEstablished;
+});
+weak.connect();
+
+const client = new Client({
+  apiUrl: '',
+  sandboxId: '',
+  authentication: () => Authentication.simple({
+    login: 'login',
+    password: 'password'
+  })
+});
+client.onConnectionEstablished(() => {
+  // onConnectionEstablished;
+});
+client.connect();