@0xobelisk/sui-client 1.0.7 → 1.0.8

package/dist/libs/http/http.d.ts

@@ -1,4 +1,4 @@
-import { WebSocket } from 'ws';
+import { WebSocketInstance } from './ws-adapter';
 export type FetchOptions = RequestInit & {
     next?: {
         revalidate?: boolean | number;
@@ -17,5 +17,5 @@ export declare class Http {
         query: string;
         variables?: any;
     }): Promise<T>;
-    subscribe(names: string[], handleData: (data: any) => void): Promise<WebSocket>;
+    subscribe(names: string[], handleData: (data: any) => void): Promise<WebSocketInstance>;
 }

package/dist/libs/http/ws-adapter.d.ts

@@ -0,0 +1,6 @@
+export type WebSocketInstance = WebSocket;
+export interface WebSocketConstructor {
+    new (url: string): WebSocket;
+}
+export declare function createWebSocketClient(url: string): WebSocketInstance;
+export declare function isWebSocketSupported(): boolean;

package/dist/libs/suiIndexerClient/index.d.ts

@@ -1,5 +1,4 @@
 import { Http } from '../http';
-import { WebSocket } from 'ws';
 export interface OrderDirection {
     ASC: 'ASC';
     DESC: 'DESC';
@@ -18,6 +17,7 @@ export interface Transaction {
     id: number;
     checkpoint: number;
     digest: string;
+    created_at: string;
 }
 export interface Schema {
     id: number;
@@ -28,6 +28,8 @@ export interface Schema {
     last_update_checkpoint: string;
     last_update_digest: string;
     is_removed: boolean;
+    created_at: string;
+    updated_at: string;
 }
 export interface Event {
     id: number;
@@ -35,6 +37,7 @@ export interface Event {
     digest: string;
     name: string;
     value: string;
+    created_at: string;
 }
 export interface ConnectionResponse<T> {
     edges: Array<{

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@0xobelisk/sui-client",
-  "version": "1.0.7",
+  "version": "1.0.8",
   "description": "Tookit for interacting with move eps framework",
   "keywords": [
     "sui",
@@ -57,7 +57,8 @@
     "tmp": "^0.2.1",
     "ts-retry-promise": "^0.7.1",
     "tweetnacl": "^1.0.3",
-    "valibot": "0.36.0"
+    "valibot": "0.36.0",
+    "ws": "^8.18.0"
   },
   "devDependencies": {
     "@commitlint/cli": "^18.0.0",
@@ -66,7 +67,6 @@
     "@types/jest": "^29.5.14",
     "@types/node": "^20.8.7",
     "@types/tmp": "^0.2.5",
-    "@types/ws": "^8.5.14",
     "@typescript-eslint/eslint-plugin": "^6.8.0",
     "@typescript-eslint/parser": "^6.8.0",
     "dotenv": "^16.3.1",
@@ -82,7 +82,7 @@
     "tsup": "^7.1.0",
     "typedoc": "^0.25.2",
     "typescript": "^5.2.2",
-    "ws": "^8.18.0"
+    "@types/ws": "^8.5.14"
   },
   "lint-staged": {
     "**/*.ts": [

package/src/dubhe.ts

@@ -55,7 +55,6 @@ import {
   SuiIndexerClient,
 } from './libs/suiIndexerClient';
 import { Http } from './libs/http';
-import { WebSocket } from 'ws';
 
 export function isUndefined(value?: unknown): value is undefined {
   return value === undefined;

package/src/libs/http/http.ts

@@ -1,5 +1,5 @@
-import { WebSocket } from 'ws';
 import { BaseError, HttpError, GraphQLError, ParseError } from './errors';
+import { createWebSocketClient, WebSocketInstance } from './ws-adapter';
 
 export type FetchOptions = RequestInit & {
   next?: {
@@ -62,7 +62,6 @@ export class Http {
     try {
       const isFirstPage = variables?.after === 'first';
       const fetchFn = this.getFetch();
-      console.log(query);
       const response = await fetchFn(this.graphqlEndpoint, {
         method: 'POST',
         headers: {
@@ -109,7 +108,6 @@ export class Http {
 
       return data.data;
     } catch (error) {
-      console.log(error);
       if (error instanceof BaseError) {
         throw error;
       }
@@ -123,30 +121,32 @@ export class Http {
     }
   }
 
-  async subscribe(names: string[], handleData: (data: any) => void): Promise<WebSocket> {
-    const ws = new WebSocket(this.wsEndpoint);
+  async subscribe(
+    names: string[],
+    handleData: (data: any) => void
+  ): Promise<WebSocketInstance> {
+    const ws = createWebSocketClient(this.wsEndpoint);
 
-    ws.on('open', () => {
+    ws.onopen = () => {
       console.log('Connected to the WebSocket server');
-      // Subscribe to specific event names
       const subscribeMessage = JSON.stringify({
         type: 'subscribe',
         names: names,
       });
       ws.send(subscribeMessage);
-    });
+    };
 
-    ws.on('message', (data) => {
-      handleData(JSON.parse(data.toString()));
-    });
+    ws.onmessage = (event) => {
+      handleData(JSON.parse(event.data.toString()));
+    };
 
-    ws.on('close', () => {
+    ws.onclose = () => {
       console.log('Disconnected from the WebSocket server');
-    });
+    };
 
-    ws.on('error', (error) => {
-      console.error(`WebSocket error: ${error}`);
-    });
+    ws.onerror = (error) => {
+      console.error(`WebSocket error:`, error);
+    };
 
     return ws;
   }

package/src/libs/http/ws-adapter.ts

@@ -0,0 +1,36 @@
+export type WebSocketInstance = WebSocket;
+
+export interface WebSocketConstructor {
+  new (url: string): WebSocket;
+}
+
+export function createWebSocketClient(url: string): WebSocketInstance {
+  if (typeof window !== 'undefined') {
+    // Browser Environment
+    return new WebSocket(url);
+  } else {
+    // Node.js Environment
+    try {
+      require.resolve('ws');
+      const WebSocket = require('ws');
+      return new WebSocket(url);
+    } catch (e) {
+      console.error('Failed to load WebSocket implementation:', e);
+      throw new Error(
+        'WebSocket implementation not available. Please install the "ws" package.'
+      );
+    }
+  }
+}
+
+export function isWebSocketSupported(): boolean {
+  if (typeof window !== 'undefined') {
+    return typeof WebSocket !== 'undefined';
+  }
+  try {
+    require.resolve('ws');
+    return true;
+  } catch {
+    return false;
+  }
+}

package/src/libs/suiIndexerClient/index.ts

@@ -1,5 +1,4 @@
 import { Http } from '../http';
-import { WebSocket } from 'ws';
 
 export interface OrderDirection {
   ASC: 'ASC';
@@ -22,6 +21,7 @@ export interface Transaction {
   id: number;
   checkpoint: number;
   digest: string;
+  created_at: string;
 }
 
 export interface Schema {
@@ -33,6 +33,8 @@ export interface Schema {
   last_update_checkpoint: string;
   last_update_digest: string;
   is_removed: boolean;
+  created_at: string;
+  updated_at: string;
 }
 
 export interface Event {
@@ -41,6 +43,7 @@ export interface Event {
   digest: string;
   name: string;
   value: string;
+  created_at: string;
 }
 
 export interface ConnectionResponse<T> {
@@ -80,6 +83,7 @@ export class SuiIndexerClient {
               id
               checkpoint
               digest
+              created_at
             }
           }
           pageInfo {
@@ -123,6 +127,8 @@ export class SuiIndexerClient {
               last_update_checkpoint
               last_update_digest
               is_removed
+              created_at
+              updated_at
             }
           }
           pageInfo {
@@ -162,6 +168,7 @@ export class SuiIndexerClient {
               digest
               name
               value
+              created_at
             }
           }
           pageInfo {