@based/client - npm Package Compare versions

Comparing version 6.4.0 to 6.5.0

dist/src/incoming/protocol.js

@@ -36,2 +36,5 @@ import { addGetToQueue } from '../outgoing/index.js';
 export const parseArrayBuffer = async (d) => {
+    if (d instanceof Uint8Array) {
+        return d;
+    }
     // needed for CF workers which return array buffers
@@ -38,0 +41,0 @@ if (d instanceof ArrayBuffer) {

dist/src/index_original.d.ts

@@ -11,2 +11,3 @@ import { BasedOpts, AuthState, FunctionResponseListeners, Settings, FunctionQueue, ObserveState, ObserveQueue, Cache, GetObserveQueue, GetState, ChannelQueue, ChannelPublishQueue, ChannelState, CallOptions, QueryOptions } from './types/index.js';
     constructor(opts?: BasedOpts, settings?: Settings);
+    restFallBack?: Settings['restFallBack'];
     storageSize: number;
@@ -13,0 +14,0 @@ maxStorageSize: number;

dist/src/index.d.ts

@@ -11,2 +11,3 @@ import { BasedOpts, AuthState, FunctionResponseListeners, Settings, FunctionQueue, ObserveState, ObserveQueue, Cache, GetObserveQueue, GetState, ChannelQueue, ChannelPublishQueue, ChannelState, CallOptions, QueryOptions } from './types/index.js';
     constructor(opts?: BasedOpts, settings?: Settings);
+    restFallBack?: Settings['restFallBack'];
     storageSize: number;
@@ -13,0 +14,0 @@ maxStorageSize: number;

dist/src/index.js

@@ -28,2 +28,5 @@ import connectWebsocket from './websocket/index.js';
         }
+        if (settings?.restFallBack) {
+            this.restFallBack = settings.restFallBack;
+        }
         if (opts) {
@@ -33,2 +36,3 @@ this.connect(opts);
     }
+    restFallBack;
     // --------- Persistent Storage
@@ -35,0 +39,0 @@ storageSize = 0;

dist/src/types/generic.d.ts

@@ -22,2 +22,5 @@ export type GenericObject = {
     persistentStorage?: string;
+    restFallBack?: {
+        pollInverval?: number;
+    };
 };

dist/src/websocket/index.js

 import urlLoader from './urlLoader.js';
 import { encodeAuthState } from '../authState/parseAuthState.js';
 import { isStreaming } from '../stream/index.js';
+import fetch from '@based/fetch';
 import WebSocket from 'isomorphic-ws';
+import { FakeWebsocket } from './FakeWebsocket.js';
 const activityListeners = new Map();
 let activeTimer;
-// Disconnect in the browser when a window is inactive (on the background) for 30 seconds
 if (typeof document !== 'undefined') {
@@ -26,2 +27,3 @@ let putToOffline = false;
     });
+    // Disconnect in the browser when a window is inactive (on the background) for 30 seconds
     document.addEventListener('visibilitychange', function () {
@@ -43,2 +45,33 @@ clearTimeout(activeTimer);
 }
+// remove the logs here
+const restPing = (ms = 500, realUrl, connection, fallback) => {
+    connection.fallBackTimer = setTimeout(() => {
+        if (!connection.disconnected) {
+            console.warn(`Cannot connect to ws in ${ms}ms`);
+            let d = Date.now();
+            connection.fallBackInProgress = true;
+            const url = `${realUrl.replace(/^ws/, 'http')}/based:rpstatus`;
+            fetch(url).then(async (r) => {
+                if (connection.fallBackInProgress) {
+                    connection.fallBackInProgress = false;
+                    const t = await r.text();
+                    if (t && t[0] === '1') {
+                        const timeEllapsed = Date.now() - d;
+                        console.warn(`Took ${timeEllapsed}ms for rest`);
+                        if (timeEllapsed < ms) {
+                            console.warn(`was able to connect to rpstatus within ${ms}ms need to fallback to rest`);
+                            fallback(t);
+                        }
+                        else {
+                            restPing(timeEllapsed + 100, realUrl, connection, fallback);
+                        }
+                    }
+                }
+                else {
+                    console.warn('Connected while trying RP - skip');
+                }
+            });
+        }
+    }, ms);
+};
 const connect = (client, url, connection = {
@@ -61,3 +94,2 @@ destroy: () => {
                         ws.close();
-                        // add online listener as well
                     }
@@ -88,8 +120,17 @@ else if (!active && isActive) {
             });
-            const ws = (connection.ws = new WebSocket(realUrl, [
-                encodeAuthState(client.authState),
-            ]));
+            const ws = (connection.ws = connection.useFallback
+                ? new FakeWebsocket(realUrl, connection.useFallback, client)
+                : new WebSocket(realUrl, [encodeAuthState(client.authState)]));
+            ws.binaryType = 'blob';
             let isError = false;
-            ws.binaryType = 'blob';
+            if (!connection.useFallback && client.restFallBack) {
+                restPing(300, realUrl, connection, (t) => {
+                    connection.useFallback = t;
+                    ws.close();
+                });
+            }
             ws.addEventListener('error', (err) => {
+                clearTimeout(connection.fallBackTimer);
+                // maybe this is a bad idea
+                connection.fallBackInProgress = false;
                 // TODO: add a websocket close number
@@ -105,2 +146,4 @@ // also for rateLimit
             ws.addEventListener('open', () => {
+                clearTimeout(connection.fallBackTimer);
+                connection.fallBackInProgress = false;
                 if (isActive) {
@@ -118,2 +161,4 @@ if (connection.disconnected) {
             ws.addEventListener('close', () => {
+                clearTimeout(connection.fallBackTimer);
+                connection.fallBackInProgress = false;
                 if (isActive) {
@@ -120,0 +165,0 @@ if (connection.disconnected) {

dist/src/websocket/types.d.ts

@@ -6,2 +6,5 @@ import WebSocket from 'isomorphic-ws';
     destroy: () => void;
+    fallBackTimer?: ReturnType<typeof setTimeout>;
+    fallBackInProgress?: boolean;
+    useFallback?: string;
 }

dist/src/websocket/types.js

@@ -5,3 +5,6 @@ export class Connection {
     destroy;
+    fallBackTimer;
+    fallBackInProgress;
+    useFallback;
 }
 //# sourceMappingURL=types.js.map

package.json

 {
   "name": "@based/client",
-  "version": "6.4.0",
+  "version": "6.5.0",
   "license": "MIT",
@@ -5,0 +5,0 @@ "scripts": {

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Network access

Supply chain risk

This module accesses the network.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

213252

increased by5.17%

Number of package files

109

increased by2.83%

Lines of code

3406

increased by5.16%

Worsened metrics

Number of medium supply chain risk alerts

2

increased byInfinity%

No dependency changes