@hautechai/sdk 0.3.5 → 0.3.7

package/dist/sdk/index.js

@@ -14,6 +14,11 @@ import { OperationsListener } from './listeners';
 import { getAPI, getBaseUrl } from './api';
 import { OperationsApi } from '../autogenerated';
 import poses from './poses';
+const replaceProtocol = (url, protocol) => {
+    const parsed = new URL(url);
+    parsed.protocol = protocol;
+    return parsed.toString();
+};
 export const createSDK = (options) => {
     let token = undefined;
     const authToken = async () => {
@@ -30,12 +35,13 @@ export const createSDK = (options) => {
     const operationsListener = new OperationsListener({
         ws: (options.useWebsocket ?? true)
             ? {
-                endpoint: getBaseUrl(options),
+                endpoint: replaceProtocol(getBaseUrl(options), 'wss'),
                 token: authToken,
             }
             : null,
         // TODO: Refactor the API initialization
         operations: () => getAPI(OperationsApi, optionsWithTokenRefresher),
+        allowPollingFallback: options.allowPollingFallback ?? true,
     });
     operationsListener.subscribe();
     return {

package/dist/sdk/listeners/index.d.ts

@@ -1,19 +1,20 @@
 import { OperationEntity, OperationsApi } from '../../autogenerated';
-import { client as WebSocketClient, connection as Connection } from 'websocket';
+import { w3cwebsocket as WebSocketClient } from 'websocket';
 export declare class OperationsListener {
     useWebsocket: {
         endpoint: string;
         token: () => string | Promise<string>;
     } | null;
     ws: WebSocketClient | null;
-    connection: Connection | null;
     operations: () => Promise<OperationsApi>;
-    constructor({ ws, operations, }: {
+    allowPollingFallback: boolean;
+    constructor({ ws, operations, allowPollingFallback, }: {
         ws: {
             endpoint: string;
             token: () => string | Promise<string>;
         } | null;
         operations: () => Promise<OperationsApi>;
+        allowPollingFallback: boolean;
     });
     operationsStore: Record<string, OperationEntity>;
     getOperation(id: string): Promise<OperationEntity | null>;

package/dist/sdk/listeners/index.js

@@ -1,12 +1,13 @@
-import { client as WebSocketClient } from 'websocket';
+import { w3cwebsocket as WebSocketClient } from 'websocket';
 import { HautechError } from '../errors';
 // This is pretty much a dirty solution until we need to rework this part.
 export class OperationsListener {
-    constructor({ ws, operations, }) {
+    constructor({ ws, operations, allowPollingFallback = false, }) {
         this.useWebsocket = null;
         this.ws = null;
-        this.connection = null;
         this.operationsStore = {};
+        if (!ws)
+            allowPollingFallback = true;
         if (ws) {
             this.useWebsocket = {
                 endpoint: ws?.endpoint,
@@ -14,10 +15,11 @@ export class OperationsListener {
             };
         }
         this.operations = operations;
+        this.allowPollingFallback = allowPollingFallback;
     }
     async getOperation(id) {
-        const isWsReady = this.connection?.connected;
-        if (!this.operationsStore[id] || !isWsReady) {
+        const fallbackToPolling = this.allowPollingFallback && !(this.ws?.readyState === WebSocket.OPEN);
+        if (!this.operationsStore[id] || fallbackToPolling) {
             const api = await this.operations();
             const operation = await api.operationsControllerGetOperationV1(id);
             if (operation.status == 200)
@@ -35,28 +37,37 @@ export class OperationsListener {
         if (!this.useWebsocket)
             return;
         try {
-            this.ws = new WebSocketClient();
-            this.ws.connect(this.useWebsocket.endpoint, ['1', await this.useWebsocket.token()]);
-            this.ws.on('connect', (connection) => {
-                this.connection = connection;
+            const token = await this.useWebsocket.token();
+            this.ws = new WebSocketClient(this.useWebsocket.endpoint, ['1', token]);
+            this.ws.onopen = () => {
                 this.onOpen();
-                connection.on('message', (msg) => {
-                    if (msg.type === 'utf8')
-                        this.onMessage(msg.utf8Data);
-                    else if (msg.type === 'binary')
-                        this.onMessage(msg.binaryData.toString('utf8'));
-                });
-                connection.on('close', (number, reason) => this.onClose(number, reason));
-            });
+            };
+            this.ws.onerror = (err) => {
+                console.error('HautechAI SDK encountered a WebSocket error: ', err);
+            };
+            this.ws.onmessage = (msg) => {
+                if (typeof msg.data === 'string') {
+                    this.onMessage(msg.data);
+                }
+                else if (msg.data instanceof Buffer) {
+                    this.onMessage(msg.data.toString('utf8'));
+                }
+                else {
+                    this.onMessage(Buffer.from(msg.data).toString('utf8'));
+                }
+            };
+            this.ws.onclose = (event) => {
+                this.onClose(event.code, event.reason);
+            };
         }
         catch (err) {
             throw new HautechError(`SDK failed to open websocket: ${err}`);
         }
     }
     onOpen() {
-        if (!this.connection)
+        if (!this.ws)
             throw new HautechError('Semantics error: this is a bug.');
-        this.connection.send(JSON.stringify({
+        this.ws.send(JSON.stringify({
             event: 'subscribe',
             data: {
                 channel: 'own_resources',
@@ -64,7 +75,7 @@ export class OperationsListener {
         }));
     }
     onMessage(msg) {
-        if (!this.connection)
+        if (!this.ws)
             throw new HautechError('Semantics error: this is a bug.');
         const { event, data } = JSON.parse(msg);
         switch (event) {
@@ -77,14 +88,13 @@ export class OperationsListener {
         }
     }
     onClose(number, reason) {
-        if (!this.connection)
+        if (!this.ws)
             throw new HautechError('Semantics error: this is a bug.');
         // Reset dirty state.
         this.operationsStore = {};
         this.ws = null;
     }
     close() {
-        this.ws?.abort();
-        this.connection?.close();
+        this.ws?.close();
     }
 }

package/dist/sdk/operations/index.d.ts

@@ -14,7 +14,7 @@ type Waited<T extends OperationEntityWithMetadata> = T & ({
     status: typeof OperationEntityStatusEnum.Finished;
     output: NonNullable<T['output']>;
 });
-declare const operations: (options: SDKOptions, relevantOperations: OperationsListener) => {
+declare const operations: (options: SDKOptions, operationsListener: OperationsListener) => {
     run: {
         haute: {
             linda: {

package/dist/sdk/operations/index.js

@@ -2,7 +2,7 @@ import { OperationsApi, } from '../../autogenerated';
 import { useAutogeneratedAPI } from '../api';
 import { transformToListResponse } from '../transformers';
 const sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
-const operations = (options, relevantOperations) => {
+const operations = (options, operationsListener) => {
     const api = useAutogeneratedAPI({ API: OperationsApi, options });
     const createOperation = (callMethod) => (props) => api.call({ run: (methods) => callMethod(methods, props) });
     return {
@@ -77,7 +77,7 @@ const operations = (options, relevantOperations) => {
             const deadline = timeoutMs ? Date.now() + timeoutMs : undefined;
             const delay = 1000;
             const poll = async (id) => {
-                const operation = await relevantOperations.getOperation(id);
+                const operation = await operationsListener.getOperation(id);
                 if (operation?.status !== 'pending')
                     return operation;
                 return null;

package/dist/types.d.ts

@@ -2,6 +2,7 @@ export interface SDKOptions {
     authToken: () => string | Promise<string>;
     endpoint?: string;
     useWebsocket?: boolean;
+    allowPollingFallback?: boolean;
 }
 export type ListProps = {
     cursor?: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hautechai/sdk",
-  "version": "0.3.5",
+  "version": "0.3.7",
   "license": "MIT",
   "keywords": [],
   "repository": {