gs2 1.0.5 → 1.3.1

package/src/chat/model/Subscribe.ts

@@ -96,19 +96,19 @@ export default class Subscribe implements IModel {
     }
 
     public static isValid(grn: string): boolean {
-        if (this.getRegion(grn) == null) {
+        if (this.getRegion(grn) == null || this.getRegion(grn) === '') {
             return false;
         }
-        if (this.getOwnerId(grn) == null) {
+        if (this.getOwnerId(grn) == null || this.getOwnerId(grn) === '') {
             return false;
         }
-        if (this.getNamespaceName(grn) == null) {
+        if (this.getNamespaceName(grn) == null || this.getNamespaceName(grn) === '') {
             return false;
         }
-        if (this.getUserId(grn) == null) {
+        if (this.getUserId(grn) == null || this.getUserId(grn) === '') {
             return false;
         }
-        if (this.getRoomName(grn) == null) {
+        if (this.getRoomName(grn) == null || this.getRoomName(grn) === '') {
             return false;
         }
         return true;

package/src/core/AbstractGs2WebSocketClient.ts

@@ -0,0 +1,26 @@
+/*
+Copyright 2016 Game Server Services, Inc. or its affiliates. All Rights
+Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License").
+You may not use this file except in compliance with the License.
+A copy of the License is located at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+or in the "license" file accompanying this file. This file is distributed
+on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+express or implied. See the License for the specific language governing
+permissions and limitations under the License.
+ */
+
+import { Gs2WebSocketSession } from './model';
+
+export default class {
+
+  public session: Gs2WebSocketSession;
+
+  constructor(session: Gs2WebSocketSession) {
+    this.session = session;
+  }
+}

package/src/core/index.ts

@@ -15,11 +15,12 @@ permissions and limitations under the License.
  */
 
 import AbstractGs2Client from './AbstractGs2RestClient';
-import { Gs2RestSession, BasicGs2Credential, ProjectTokenGs2Credential, Region } from './model';
+import { Gs2RestSession, Gs2WebSocketSession, BasicGs2Credential, ProjectTokenGs2Credential, Region } from './model';
 
 export default {
   AbstractGs2Client,
   Gs2RestSession,
+  Gs2WebSocketSession,
   BasicGs2Credential,
   ProjectTokenGs2Credential,
   Region,

package/src/core/model.ts

@@ -17,6 +17,9 @@ permissions and limitations under the License.
 import IGs2Credential from './interface/IGs2Credential';
 import IModel from './interface/IModel';
 import axios from 'axios';
+import waitUntil from "async-wait-until";
+import { v4 as uuid } from 'uuid';
+const WebSocket = require('ws');
 
 export class BasicGs2Credential implements IGs2Credential {
 
@@ -83,6 +86,146 @@ export class Gs2RestSession {
   }
 }
 
+
+export class Gs2WebSocketSession {
+
+  public credential: IGs2Credential;
+  private client: WebSocket | null = null;
+  public region: string;
+  public projectToken: string | null;
+  public expiresAt: number | null;
+
+  private inflightRequest: any = {};
+
+  private onOpenHandlers: Function[] = [];
+  private onErrorHandlers: Function[] = [];
+  private onCloseHandlers: Function[] = [];
+
+  private onNotificationHandlers: Function[] = [];
+
+  constructor(credential: IGs2Credential, region: string) {
+    this.credential = credential;
+    this.region = region;
+    this.projectToken = null;
+    this.expiresAt = null;
+  }
+
+  public async connect(): Promise<any> {
+
+    const service = 'identifier';
+    const url = Gs2Constant.ENDPOINT_HOST
+            .replace('{service}', service)
+            .replace('{region}', this.region)
+        + '/projectToken/login';
+
+    if (this.credential instanceof BasicGs2Credential) {
+      const data = {
+        client_id: (this.credential as BasicGs2Credential).clientId,
+        client_secret: (this.credential as BasicGs2Credential).clientSecret,
+      };
+
+      const response = await axios.post(
+          url,
+          data,
+      )
+      const result = new LoginResult(response.data);
+      this.projectToken = result.accessToken;
+      this.expiresAt = new Date().getTime() + result.expiresIn * 1000;
+    } else if (this.credential instanceof ProjectTokenGs2Credential) {
+      this.projectToken = (this.credential as ProjectTokenGs2Credential).projectToken;
+    }
+
+    this.client = new WebSocket(Gs2Constant.WS_ENDPOINT_HOST.replace('{region}', this.region));
+    this.client!.onopen = (event: Event): any => {
+      for (let i=0; i<this.onOpenHandlers.length; i++) {
+        this.onOpenHandlers[i]();
+      }
+    };
+    this.client!.onmessage = (message: MessageEvent) => {
+      const payload = JSON.parse(message.data);
+      if (payload.type == 'notification') {
+        for (let i=0; i<this.onNotificationHandlers.length; i++) {
+          this.onNotificationHandlers[i](payload.body);
+        }
+      } else {
+        this.inflightRequest[payload.requestId] = payload;
+      }
+    };
+    this.client!.onerror = (error: Event) => {
+      for (let i = 0; i < this.onErrorHandlers.length; i++) {
+        this.onErrorHandlers[i](error);
+      }
+    };
+    this.client!.onclose = () => {
+      for (let i=0; i<this.onCloseHandlers.length; i++) {
+        this.onCloseHandlers[i]();
+      }
+    };
+    await waitUntil(() => this.client == null || this.client.readyState == WebSocket.CLOSED || this.client.readyState == WebSocket.OPEN);
+  }
+
+  public async send(
+      service: string,
+      component: string,
+      func: string,
+      payload: any,
+  ): Promise<any> {
+
+    const requestId = uuid();
+
+    this.inflightRequest[requestId] = null;
+    this.client?.send(JSON.stringify(Object.assign({}, payload, {
+      xGs2ClientId: this.credential.clientId,
+      xGs2ProjectToken: this.projectToken,
+      x_gs2: {
+        service: service,
+        component: component,
+        function: func,
+        contentType: "application/json",
+        requestId : requestId,
+      },
+    })));
+
+    await waitUntil(() => this.inflightRequest[requestId] != null);
+
+    const result = this.inflightRequest[requestId];
+    delete this.inflightRequest[requestId];
+    if (result.status != 200) {
+      throw result.body;
+    }
+    return result.body;
+  }
+
+  public onOpen(func: (ev: Event) => any) {
+    this.onOpenHandlers.push(func);
+  }
+
+  public onError(func: (ev: Event) => any) {
+    this.onErrorHandlers.push(func);
+  }
+
+  public onClose(func: (ev: CloseEvent) => any) {
+    this.onCloseHandlers.push(func);
+  }
+
+  public onNotification(func: (message: {
+    subject: string,
+    issuer: string,
+    payload: any,
+  }) => any) {
+    this.onNotificationHandlers.push(func);
+  }
+
+  public async disconnect(): Promise<any> {
+    if (this.client != null) {
+      this.client.close();
+      await waitUntil(() => this.client == null || this.client.readyState == WebSocket.CLOSED);
+      this.client = null;
+    }
+    this.projectToken = null;
+  }
+}
+
 class LoginResult {
 
   public accessToken!: string;
@@ -129,6 +272,7 @@ export class ProjectTokenGs2Credential implements IGs2Credential {
 
 export const Gs2Constant = {
   ENDPOINT_HOST: 'https://{service}.{region}.gen2.gs2io.com',
+  WS_ENDPOINT_HOST: 'wss://gateway-ws.{region}.gen2.gs2io.com',
 };
 
 export const Region = {

package/src/datastore/model/DataObject.ts

@@ -100,19 +100,19 @@ export default class DataObject implements IModel {
     }
 
     public static isValid(grn: string): boolean {
-        if (this.getRegion(grn) == null) {
+        if (this.getRegion(grn) == null || this.getRegion(grn) === '') {
             return false;
         }
-        if (this.getOwnerId(grn) == null) {
+        if (this.getOwnerId(grn) == null || this.getOwnerId(grn) === '') {
             return false;
         }
-        if (this.getNamespaceName(grn) == null) {
+        if (this.getNamespaceName(grn) == null || this.getNamespaceName(grn) === '') {
             return false;
         }
-        if (this.getUserId(grn) == null) {
+        if (this.getUserId(grn) == null || this.getUserId(grn) === '') {
             return false;
         }
-        if (this.getDataObjectName(grn) == null) {
+        if (this.getDataObjectName(grn) == null || this.getDataObjectName(grn) === '') {
             return false;
         }
         return true;

package/src/datastore/model/DataObjectHistory.ts

@@ -115,22 +115,22 @@ export default class DataObjectHistory implements IModel {
     }
 
     public static isValid(grn: string): boolean {
-        if (this.getRegion(grn) == null) {
+        if (this.getRegion(grn) == null || this.getRegion(grn) === '') {
             return false;
         }
-        if (this.getOwnerId(grn) == null) {
+        if (this.getOwnerId(grn) == null || this.getOwnerId(grn) === '') {
             return false;
         }
-        if (this.getNamespaceName(grn) == null) {
+        if (this.getNamespaceName(grn) == null || this.getNamespaceName(grn) === '') {
             return false;
         }
-        if (this.getUserId(grn) == null) {
+        if (this.getUserId(grn) == null || this.getUserId(grn) === '') {
             return false;
         }
-        if (this.getDataObjectName(grn) == null) {
+        if (this.getDataObjectName(grn) == null || this.getDataObjectName(grn) === '') {
             return false;
         }
-        if (this.getGeneration(grn) == null) {
+        if (this.getGeneration(grn) == null || this.getGeneration(grn) === '') {
             return false;
         }
         return true;

package/src/datastore/model/Namespace.ts

@@ -65,13 +65,13 @@ export default class Namespace implements IModel {
     }
 
     public static isValid(grn: string): boolean {
-        if (this.getRegion(grn) == null) {
+        if (this.getRegion(grn) == null || this.getRegion(grn) === '') {
             return false;
         }
-        if (this.getOwnerId(grn) == null) {
+        if (this.getOwnerId(grn) == null || this.getOwnerId(grn) === '') {
             return false;
         }
-        if (this.getNamespaceName(grn) == null) {
+        if (this.getNamespaceName(grn) == null || this.getNamespaceName(grn) === '') {
             return false;
         }
         return true;

package/src/deploy/model/Event.ts

@@ -78,16 +78,16 @@ export default class Event implements IModel {
     }
 
     public static isValid(grn: string): boolean {
-        if (this.getRegion(grn) == null) {
+        if (this.getRegion(grn) == null || this.getRegion(grn) === '') {
             return false;
         }
-        if (this.getOwnerId(grn) == null) {
+        if (this.getOwnerId(grn) == null || this.getOwnerId(grn) === '') {
             return false;
         }
-        if (this.getStackName(grn) == null) {
+        if (this.getStackName(grn) == null || this.getStackName(grn) === '') {
             return false;
         }
-        if (this.getEventName(grn) == null) {
+        if (this.getEventName(grn) == null || this.getEventName(grn) === '') {
             return false;
         }
         return true;

package/src/deploy/model/Output.ts

@@ -76,16 +76,16 @@ export default class Output implements IModel {
     }
 
     public static isValid(grn: string): boolean {
-        if (this.getRegion(grn) == null) {
+        if (this.getRegion(grn) == null || this.getRegion(grn) === '') {
             return false;
         }
-        if (this.getOwnerId(grn) == null) {
+        if (this.getOwnerId(grn) == null || this.getOwnerId(grn) === '') {
             return false;
         }
-        if (this.getStackName(grn) == null) {
+        if (this.getStackName(grn) == null || this.getStackName(grn) === '') {
             return false;
         }
-        if (this.getOutputName(grn) == null) {
+        if (this.getOutputName(grn) == null || this.getOutputName(grn) === '') {
             return false;
         }
         return true;

package/src/deploy/model/Resource.ts

@@ -84,16 +84,16 @@ export default class Resource implements IModel {
     }
 
     public static isValid(grn: string): boolean {
-        if (this.getRegion(grn) == null) {
+        if (this.getRegion(grn) == null || this.getRegion(grn) === '') {
             return false;
         }
-        if (this.getOwnerId(grn) == null) {
+        if (this.getOwnerId(grn) == null || this.getOwnerId(grn) === '') {
             return false;
         }
-        if (this.getStackName(grn) == null) {
+        if (this.getStackName(grn) == null || this.getStackName(grn) === '') {
             return false;
         }
-        if (this.getResourceName(grn) == null) {
+        if (this.getResourceName(grn) == null || this.getResourceName(grn) === '') {
             return false;
         }
         return true;

package/src/deploy/model/Stack.ts

@@ -63,13 +63,13 @@ export default class Stack implements IModel {
     }
 
     public static isValid(grn: string): boolean {
-        if (this.getRegion(grn) == null) {
+        if (this.getRegion(grn) == null || this.getRegion(grn) === '') {
             return false;
         }
-        if (this.getOwnerId(grn) == null) {
+        if (this.getOwnerId(grn) == null || this.getOwnerId(grn) === '') {
             return false;
         }
-        if (this.getStackName(grn) == null) {
+        if (this.getStackName(grn) == null || this.getStackName(grn) === '') {
             return false;
         }
         return true;

package/src/dictionary/model/CurrentEntryMaster.ts

@@ -58,13 +58,13 @@ export default class CurrentEntryMaster implements IModel {
     }
 
     public static isValid(grn: string): boolean {
-        if (this.getRegion(grn) == null) {
+        if (this.getRegion(grn) == null || this.getRegion(grn) === '') {
             return false;
         }
-        if (this.getOwnerId(grn) == null) {
+        if (this.getOwnerId(grn) == null || this.getOwnerId(grn) === '') {
             return false;
         }
-        if (this.getNamespaceName(grn) == null) {
+        if (this.getNamespaceName(grn) == null || this.getNamespaceName(grn) === '') {
             return false;
         }
         return true;

package/src/dictionary/model/Entry.ts

@@ -94,19 +94,19 @@ export default class Entry implements IModel {
     }
 
     public static isValid(grn: string): boolean {
-        if (this.getRegion(grn) == null) {
+        if (this.getRegion(grn) == null || this.getRegion(grn) === '') {
             return false;
         }
-        if (this.getOwnerId(grn) == null) {
+        if (this.getOwnerId(grn) == null || this.getOwnerId(grn) === '') {
             return false;
         }
-        if (this.getNamespaceName(grn) == null) {
+        if (this.getNamespaceName(grn) == null || this.getNamespaceName(grn) === '') {
             return false;
         }
-        if (this.getUserId(grn) == null) {
+        if (this.getUserId(grn) == null || this.getUserId(grn) === '') {
             return false;
         }
-        if (this.getEntryModelName(grn) == null) {
+        if (this.getEntryModelName(grn) == null || this.getEntryModelName(grn) === '') {
             return false;
         }
         return true;

package/src/dictionary/model/EntryModel.ts

@@ -75,16 +75,16 @@ export default class EntryModel implements IModel {
     }
 
     public static isValid(grn: string): boolean {
-        if (this.getRegion(grn) == null) {
+        if (this.getRegion(grn) == null || this.getRegion(grn) === '') {
             return false;
         }
-        if (this.getOwnerId(grn) == null) {
+        if (this.getOwnerId(grn) == null || this.getOwnerId(grn) === '') {
             return false;
         }
-        if (this.getNamespaceName(grn) == null) {
+        if (this.getNamespaceName(grn) == null || this.getNamespaceName(grn) === '') {
             return false;
         }
-        if (this.getEntryName(grn) == null) {
+        if (this.getEntryName(grn) == null || this.getEntryName(grn) === '') {
             return false;
         }
         return true;

package/src/dictionary/model/EntryModelMaster.ts

@@ -78,16 +78,16 @@ export default class EntryModelMaster implements IModel {
     }
 
     public static isValid(grn: string): boolean {
-        if (this.getRegion(grn) == null) {
+        if (this.getRegion(grn) == null || this.getRegion(grn) === '') {
             return false;
         }
-        if (this.getOwnerId(grn) == null) {
+        if (this.getOwnerId(grn) == null || this.getOwnerId(grn) === '') {
             return false;
         }
-        if (this.getNamespaceName(grn) == null) {
+        if (this.getNamespaceName(grn) == null || this.getNamespaceName(grn) === '') {
             return false;
         }
-        if (this.getEntryName(grn) == null) {
+        if (this.getEntryName(grn) == null || this.getEntryName(grn) === '') {
             return false;
         }
         return true;

package/src/dictionary/model/Namespace.ts

@@ -66,13 +66,13 @@ export default class Namespace implements IModel {
     }
 
     public static isValid(grn: string): boolean {
-        if (this.getRegion(grn) == null) {
+        if (this.getRegion(grn) == null || this.getRegion(grn) === '') {
             return false;
         }
-        if (this.getOwnerId(grn) == null) {
+        if (this.getOwnerId(grn) == null || this.getOwnerId(grn) === '') {
             return false;
         }
-        if (this.getNamespaceName(grn) == null) {
+        if (this.getNamespaceName(grn) == null || this.getNamespaceName(grn) === '') {
             return false;
         }
         return true;

package/src/distributor/model/CurrentDistributorMaster.ts

@@ -58,13 +58,13 @@ export default class CurrentDistributorMaster implements IModel {
     }
 
     public static isValid(grn: string): boolean {
-        if (this.getRegion(grn) == null) {
+        if (this.getRegion(grn) == null || this.getRegion(grn) === '') {
             return false;
         }
-        if (this.getOwnerId(grn) == null) {
+        if (this.getOwnerId(grn) == null || this.getOwnerId(grn) === '') {
             return false;
         }
-        if (this.getNamespaceName(grn) == null) {
+        if (this.getNamespaceName(grn) == null || this.getNamespaceName(grn) === '') {
             return false;
         }
         return true;

package/src/distributor/model/DistributorModel.ts

@@ -77,16 +77,16 @@ export default class DistributorModel implements IModel {
     }
 
     public static isValid(grn: string): boolean {
-        if (this.getRegion(grn) == null) {
+        if (this.getRegion(grn) == null || this.getRegion(grn) === '') {
             return false;
         }
-        if (this.getOwnerId(grn) == null) {
+        if (this.getOwnerId(grn) == null || this.getOwnerId(grn) === '') {
             return false;
         }
-        if (this.getNamespaceName(grn) == null) {
+        if (this.getNamespaceName(grn) == null || this.getNamespaceName(grn) === '') {
             return false;
         }
-        if (this.getDistributorName(grn) == null) {
+        if (this.getDistributorName(grn) == null || this.getDistributorName(grn) === '') {
             return false;
         }
         return true;

package/src/distributor/model/DistributorModelMaster.ts

@@ -80,16 +80,16 @@ export default class DistributorModelMaster implements IModel {
     }
 
     public static isValid(grn: string): boolean {
-        if (this.getRegion(grn) == null) {
+        if (this.getRegion(grn) == null || this.getRegion(grn) === '') {
             return false;
         }
-        if (this.getOwnerId(grn) == null) {
+        if (this.getOwnerId(grn) == null || this.getOwnerId(grn) === '') {
             return false;
         }
-        if (this.getNamespaceName(grn) == null) {
+        if (this.getNamespaceName(grn) == null || this.getNamespaceName(grn) === '') {
             return false;
         }
-        if (this.getDistributorName(grn) == null) {
+        if (this.getDistributorName(grn) == null || this.getDistributorName(grn) === '') {
             return false;
         }
         return true;

package/src/distributor/model/Namespace.ts

@@ -64,13 +64,13 @@ export default class Namespace implements IModel {
     }
 
     public static isValid(grn: string): boolean {
-        if (this.getRegion(grn) == null) {
+        if (this.getRegion(grn) == null || this.getRegion(grn) === '') {
             return false;
         }
-        if (this.getOwnerId(grn) == null) {
+        if (this.getOwnerId(grn) == null || this.getOwnerId(grn) === '') {
             return false;
         }
-        if (this.getNamespaceName(grn) == null) {
+        if (this.getNamespaceName(grn) == null || this.getNamespaceName(grn) === '') {
             return false;
         }
         return true;

package/src/enhance/model/CurrentRateMaster.ts

@@ -58,13 +58,13 @@ export default class CurrentRateMaster implements IModel {
     }
 
     public static isValid(grn: string): boolean {
-        if (this.getRegion(grn) == null) {
+        if (this.getRegion(grn) == null || this.getRegion(grn) === '') {
             return false;
         }
-        if (this.getOwnerId(grn) == null) {
+        if (this.getOwnerId(grn) == null || this.getOwnerId(grn) === '') {
             return false;
         }
-        if (this.getNamespaceName(grn) == null) {
+        if (this.getNamespaceName(grn) == null || this.getNamespaceName(grn) === '') {
             return false;
         }
         return true;

package/src/enhance/model/Namespace.ts

@@ -68,13 +68,13 @@ export default class Namespace implements IModel {
     }
 
     public static isValid(grn: string): boolean {
-        if (this.getRegion(grn) == null) {
+        if (this.getRegion(grn) == null || this.getRegion(grn) === '') {
             return false;
         }
-        if (this.getOwnerId(grn) == null) {
+        if (this.getOwnerId(grn) == null || this.getOwnerId(grn) === '') {
             return false;
         }
-        if (this.getNamespaceName(grn) == null) {
+        if (this.getNamespaceName(grn) == null || this.getNamespaceName(grn) === '') {
             return false;
         }
         return true;

package/src/enhance/model/RateModel.ts

@@ -83,16 +83,16 @@ export default class RateModel implements IModel {
     }
 
     public static isValid(grn: string): boolean {
-        if (this.getRegion(grn) == null) {
+        if (this.getRegion(grn) == null || this.getRegion(grn) === '') {
             return false;
         }
-        if (this.getOwnerId(grn) == null) {
+        if (this.getOwnerId(grn) == null || this.getOwnerId(grn) === '') {
             return false;
         }
-        if (this.getNamespaceName(grn) == null) {
+        if (this.getNamespaceName(grn) == null || this.getNamespaceName(grn) === '') {
             return false;
         }
-        if (this.getRateName(grn) == null) {
+        if (this.getRateName(grn) == null || this.getRateName(grn) === '') {
             return false;
         }
         return true;

package/src/enhance/model/RateModelMaster.ts

@@ -85,16 +85,16 @@ export default class RateModelMaster implements IModel {
     }
 
     public static isValid(grn: string): boolean {
-        if (this.getRegion(grn) == null) {
+        if (this.getRegion(grn) == null || this.getRegion(grn) === '') {
             return false;
         }
-        if (this.getOwnerId(grn) == null) {
+        if (this.getOwnerId(grn) == null || this.getOwnerId(grn) === '') {
             return false;
         }
-        if (this.getNamespaceName(grn) == null) {
+        if (this.getNamespaceName(grn) == null || this.getNamespaceName(grn) === '') {
             return false;
         }
-        if (this.getRateName(grn) == null) {
+        if (this.getRateName(grn) == null || this.getRateName(grn) === '') {
             return false;
         }
         return true;