@squidcloud/client 1.0.187 → 1.0.188

package/dist/cjs/index.js

@@ -29491,12 +29491,20 @@ var rfdc_default = /*#__PURE__*/__webpack_require__.n(rfdc);
 
 
 
-function getInPath(obj, path, delimiter = '.') {
-    const splitPath = path.split(delimiter);
+const SPLIT_REGEX_FOR_GET_IN_PATH = /[.\[\]]/;
+/** Returns a value by the `path`. Works with array indexes, like a.b[0]. */
+function getInPath(obj, path) {
+    if (!obj) {
+        return undefined;
+    }
+    const splitPath = path.split(SPLIT_REGEX_FOR_GET_IN_PATH);
     let value = undefined;
     let currentObj = obj;
     while (currentObj && splitPath.length) {
-        const key = (0,dist.truthy)(splitPath.shift());
+        const key = splitPath.shift();
+        if (!key) {
+            continue;
+        }
         if (typeof currentObj !== 'object' || !(key in currentObj)) {
             return undefined;
         }
@@ -29511,6 +29519,7 @@ function isJsObject(obj) {
 function isDateObject(value) {
     return Object.prototype.toString.call(value) === '[object Date]';
 }
+/** Sets a value by path . Does not support array indexes. */
 function setInPath(obj, path, value, delimiter = '.') {
     var _a;
     const splitPath = path.split(delimiter);
@@ -29628,10 +29637,23 @@ function cloneDeep(value) {
     // and it cases some tests to fail.
     return rfdc_default()()(value);
 }
+/** Compares 2 values. 'null' and 'undefined' values are considered equal and are less than any other values. */
+// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
+function compareValues(a, b) {
+    if (a === b || (isNil(a) && isNil(b))) {
+        return 0;
+    }
+    else if (isNil(a)) {
+        return -1;
+    }
+    else if (isNil(b)) {
+        return 1;
+    }
+    return a < b ? -1 : a > b ? 1 : 0;
+}
 
 ;// CONCATENATED MODULE: ../internal-common/src/public-types/mutation.public-context.ts
 
-
 /** The mutation context that will be provided to the security function. */
 class MutationContext {
     /**
@@ -29653,8 +29675,8 @@ class MutationContext {
     }
     /** Returns true if the mutation affects the provided path. */
     affectsPath(path) {
-        const before = this.before ? lodash.get(this.before, path) : undefined;
-        const after = this.after ? lodash.get(this.after, path) : undefined;
+        const before = getInPath(this.before, path);
+        const after = getInPath(this.after, path);
         return !isEqual(before, after);
     }
 }
@@ -29718,18 +29740,6 @@ class Pagination {
             .snapshots(this.options.subscribe);
         this.snapshotSubject.next(firstPageSnapshot);
     }
-    static compareValues(a, b) {
-        if (a === b || (isNil(a) && isNil(b))) {
-            return 0;
-        }
-        else if (isNil(a)) {
-            return -1;
-        }
-        else if (isNil(b)) {
-            return 1;
-        }
-        return a < b ? -1 : a > b ? 1 : 0;
-    }
     compareObjects(doc1, doc2) {
         if (doc1 === doc2 || (isNil(doc1) && isNil(doc2))) {
             return 0;
@@ -29744,7 +29754,7 @@ class Pagination {
         for (const { fieldName, asc } of sortOrders) {
             const value1 = getInPath(doc1, fieldName);
             const value2 = getInPath(doc2, fieldName);
-            const rc = Pagination.compareValues(value1, value2);
+            const rc = compareValues(value1, value2);
             if (rc !== 0) {
                 return asc ? rc : -rc;
             }
@@ -30138,7 +30148,6 @@ function parseQuerySubscriptionId(querySubscriptionId) {
 
 
 
-
 /**
  * The compare table is used to determine whether one condition (conditionA)
  * is a subset of another condition (conditionB).
@@ -30314,7 +30323,7 @@ class QueryContext {
         for (const contextCondition of this.parsedConditions) {
             const fieldNameOrPath = contextCondition.fieldName;
             const operator = contextCondition.operator;
-            const valueInDoc = lodash.get(doc, fieldNameOrPath);
+            const valueInDoc = getInPath(doc, fieldNameOrPath);
             if (operator === 'in') {
                 if (contextCondition.value.includes(valueInDoc)) {
                     continue;
@@ -47329,13 +47338,6 @@ function setSquidPrivateOption(optionName, value) {
 function getSquidPrivateOption(optionName) {
     return getSquidPrivateOptions()[optionName];
 }
-/*** Set of constants for private options. */
-/**
- * When set to 'true' (boolean), the RPC manager in Squid uses new 'fetch' based
- * HTTP client instead of axios library.
- * The option will be removed after the migration is tested and all issues are fixed.
- */
-const SQUID_PRIVATE_OPTION_USE_FETCH_IN_RPC_MANAGER = 'useFetchInRpcManager';
 /**
  * When set to 'true' (boolean), the Graphql client in Squid uses new 'fetch' based
  * HTTP client instead of cross-fetch library.
@@ -48256,7 +48258,7 @@ class ClientIdService {
         this.clientTooOldSubject.next(true);
         this.clientIdSubject.next(this.generateClientId());
     }
-    notifyClientReadyToBeRegenerated() {
+    notifyClientNotTooOld() {
         this.clientTooOldSubject.next(false);
     }
     observeClientReadyToBeRegenerated() {
@@ -49439,21 +49441,13 @@ class DocumentStore {
     getDocumentOrUndefined(squidDocId) {
         return this.squidDocIdToDoc.get(squidDocId);
     }
-    compareValues(a, b) {
-        if (isNil(a)) {
-            return isNil(b) ? 0 : -1;
-        }
-        if (isNil(b))
-            return 1;
-        if (a === b)
-            return 0;
-        return a > b ? 1 : -1;
-    }
-    compareSquidDocs(a, b, sortFieldNames, sortOrders) {
-        for (const [i, fieldName] of sortFieldNames.entries()) {
-            const compare = this.compareValues(lodash_default().get(a, fieldName), lodash_default().get(b, fieldName));
-            if (compare !== 0) {
-                return sortOrders[i] === 'asc' ? compare : -1 * compare;
+    compareSquidDocs(a, b, sortOrders) {
+        for (const { fieldName, asc } of sortOrders) {
+            const valueA = getInPath(a, fieldName);
+            const valueB = getInPath(b, fieldName);
+            const rc = compareValues(valueA, valueB);
+            if (rc !== 0) {
+                return asc ? rc : -rc;
             }
         }
         return 0;
@@ -49469,11 +49463,7 @@ class DocumentStore {
         }
         const docs = [...docIdSet].map(id => this.squidDocIdToDoc.get(id)).filter(dist.isNonNullable);
         const { sortOrder, limitBy } = query;
-        const sortFieldNames = sortOrder.map(s => s.fieldName);
-        const sortOrders = sortOrder.map(s => (s.asc ? 'asc' : 'desc'));
-        const sortedDocs = docs.sort((a, b) => {
-            return this.compareSquidDocs(a, b, sortFieldNames, sortOrders);
-        });
+        const sortedDocs = docs.sort((a, b) => this.compareSquidDocs(a, b, sortOrder));
         const mainLimit = query.limit < 0 ? 2000 : query.limit;
         if (!limitBy) {
             return sortedDocs.slice(0, mainLimit);
@@ -50587,13 +50577,9 @@ class RateLimiter {
     }
 }
 
-;// CONCATENATED MODULE: external "axios"
-const external_axios_namespaceObject = require("axios");
-var external_axios_default = /*#__PURE__*/__webpack_require__.n(external_axios_namespaceObject);
 ;// CONCATENATED MODULE: ./src/squid-http-client.ts
 
 
-
 class RpcError extends Error {
     /** @internal */
     constructor(statusCode, statusText, url, headers, body, message) {
@@ -50605,20 +50591,12 @@ class RpcError extends Error {
         this.body = body;
     }
 }
-function isFetchMode() {
-    // Temporary (1 week) keep the old code to simplify rollback.
-    return true;
-    // Native fetch is used in json request mode or when the corresponding private Squid option is enabled.
-    // This option is enabled in console-local and console-dev modes both in Web & Backend.
-    // return files.length === 0 || !!getSquidPrivateOption(SQUID_PRIVATE_OPTION_USE_FETCH_IN_RPC_MANAGER);
-}
 /**
  * Runs a post request to the given URL.
  * @internal.
  */
 async function rawSquidHttpPost(input) {
-    const isFetch = isFetchMode();
-    const response = await (isFetch ? performFetchRequest(input) : performAxiosRequest(input));
+    const response = await performFetchRequest(input);
     response.body = tryDeserializing(response.body);
     return response;
 }
@@ -50626,7 +50604,6 @@ async function performFetchRequest({ headers, files, filesFieldName, message: bo
     const requestOptionHeaders = new Headers(headers);
     const requestOptions = { method: 'POST', headers: requestOptionHeaders, body: undefined };
     if (files.length) {
-        // noinspection DuplicatedCode
         const formData = new FormData();
         for (const file of files) {
             const blob = file instanceof Blob ? file : file.blob;
@@ -50648,7 +50625,6 @@ async function performFetchRequest({ headers, files, filesFieldName, message: bo
         });
         if (!response.ok) {
             const rawBody = await response.text();
-            // noinspection DuplicatedCode
             const parsedBody = tryDeserializing(rawBody);
             if (!extractErrorMessage) {
                 // noinspection ExceptionCaughtLocallyJS
@@ -50678,71 +50654,6 @@ async function performFetchRequest({ headers, files, filesFieldName, message: bo
         throw e;
     }
 }
-function extractAxiosResponseHeaders(response) {
-    return Object.entries(response.headers).reduce((acc, [key, value]) => {
-        acc[key] = value;
-        return acc;
-    }, {});
-}
-async function performAxiosRequest({ files, filesFieldName, message: body, url, headers, extractErrorMessage, }) {
-    let axiosResponse;
-    try {
-        if (files.length) {
-            // noinspection DuplicatedCode
-            const formData = new FormData();
-            for (const file of files) {
-                const blob = file instanceof Blob ? file : file.blob;
-                const filename = file instanceof Blob ? undefined : file.name;
-                formData.append(filesFieldName, blob, filename);
-            }
-            formData.append('body', serializeObj(body));
-            // Make the axios call
-            axiosResponse = await external_axios_default().post(url, formData, {
-                headers,
-                responseType: 'text',
-            });
-        }
-        else {
-            axiosResponse = await external_axios_default().post(url, serializeObj(body), {
-                headers: Object.assign(Object.assign({}, headers), { 'Content-Type': 'application/json' }),
-                responseType: 'text',
-            });
-        }
-    }
-    catch (error) {
-        if ((0,external_axios_namespaceObject.isAxiosError)(error)) {
-            const { response } = error;
-            if (!response)
-                throw error;
-            const responseHeaders = extractAxiosResponseHeaders(response);
-            const rawBody = response.data;
-            // noinspection DuplicatedCode
-            const parsedBody = tryDeserializing(rawBody);
-            if (!extractErrorMessage) {
-                throw new RpcError(response.status, response.statusText, url, responseHeaders, parsedBody, rawBody);
-            }
-            let message;
-            try {
-                message = typeof parsedBody === 'string' ? parsedBody : (parsedBody === null || parsedBody === void 0 ? void 0 : parsedBody['message']) || rawBody;
-            }
-            catch (_a) { }
-            if (!message)
-                message = response.statusText;
-            throw new RpcError(response.status, response.statusText, url, responseHeaders, parsedBody, message);
-        }
-        else {
-            throw error;
-        }
-    }
-    const responseHeaders = extractAxiosResponseHeaders(axiosResponse);
-    DebugLogger.debug(`received response: ${JSON.stringify(axiosResponse.data)}`);
-    return {
-        body: axiosResponse.data,
-        headers: responseHeaders,
-        status: axiosResponse.status,
-        statusText: axiosResponse.statusText,
-    };
-}
 /**
  * @internal.
  *
@@ -51038,28 +50949,30 @@ class SocketManager {
         }))
             .subscribe(() => {
             if (this.connectionReady.value) {
-                DebugLogger.debug('Client reconnected before becoming too old. Ignoring...');
+                DebugLogger.debug(`Client reconnected before becoming too old. Ignoring... ${this.clientIdService.getClientId()}`);
                 return;
             }
+            DebugLogger.debug(`Client disconnected for a long period - refreshing ${this.clientIdService.getClientId()}`);
             this.refreshClient();
         });
         this.observeConnectionReady()
             .pipe((0,external_rxjs_.filter)(Boolean))
             .subscribe(() => {
             if (this.clientIdService.isClientTooOld()) {
-                this.clientIdService.notifyClientReadyToBeRegenerated();
+                this.clientIdService.notifyClientNotTooOld();
             }
         });
     }
     refreshClient() {
         if (this.destructManager.isDestructing) {
-            DebugLogger.debug('Client too old but is destructed. Ignoring...');
+            DebugLogger.debug(`Client too old but is destructed. Ignoring... ${this.clientIdService.getClientId()}`);
             return;
         }
         else if (this.clientIdService.isClientTooOld()) {
-            DebugLogger.debug('Client is already marked as too old. Ignoring...');
+            DebugLogger.debug(`Client is already marked as too old. Ignoring... ${this.clientIdService.getClientId()}`);
             return;
         }
+        DebugLogger.debug(`Notifying client too old ${this.clientIdService.getClientId()}`);
         this.clientIdService.notifyClientTooOld();
         DebugLogger.debug('Client too old. Reconnecting...');
         this.connect();
@@ -51067,6 +50980,7 @@ class SocketManager {
     tick() {
         const diff = Math.abs(Date.now() - this.lastTick.getTime());
         if (diff > this.clientTooOldThreshold) {
+            DebugLogger.debug('Tick: Client not responding for a long time. Refreshing...', this.clientIdService.getClientId());
             this.refreshClient();
         }
         this.lastTick = new Date();
@@ -51115,29 +51029,45 @@ class SocketManager {
     connect() {
         var _a;
         (_a = this.socket) === null || _a === void 0 ? void 0 : _a.close();
+        if (this.connectionReady.value) {
+            this.connectionReady.next(false);
+        }
         const endpoint = getApplicationUrl(this.region, this.appId, 'ws/general')
             .replace('https', 'wss')
             .replace('http', 'ws');
-        DebugLogger.debug('Connecting to socket at:', endpoint);
-        const socketUri = `${endpoint}?clientId=${this.clientIdService.getClientId()}`;
+        const clientId = this.clientIdService.getClientId();
+        DebugLogger.debug('Connecting to socket at:', endpoint, 'clientId:', clientId);
+        const socketUri = `${endpoint}?clientId=${clientId}`;
         this.socket = createWebSocketWrapper(socketUri, {
             timeout: 5000, // 5 seconds
             onmessage: (e) => this.onMessage(e.data),
             onopen: () => {
-                DebugLogger.debug(`Connection to socket established. Endpoint: ${endpoint}`);
+                DebugLogger.debug(`Connection to socket established. Endpoint: ${endpoint}  ${this.clientIdService.getClientId()}`);
             },
             onreconnect: () => {
-                DebugLogger.debug(`WebSocket reconnect event triggered`);
-                this.connectionReady.next(false);
+                DebugLogger.debug(`WebSocket reconnect event triggered ${clientId}`);
+                if (this.clientIdService.getClientId() !== clientId) {
+                    DebugLogger.debug(`WebSocket reconnect event triggered - ignored because the client id changed. Old: ${clientId}, new: ${this.clientIdService.getClientId()}`);
+                    return;
+                }
+                if (this.connectionReady.value) {
+                    this.connectionReady.next(false);
+                }
             },
             onclose: () => {
-                DebugLogger.debug(`WebSocket onclose event triggered`);
-                this.connectionReady.next(false);
+                DebugLogger.debug(`WebSocket onclose event triggered ${clientId}`);
+                if (this.clientIdService.getClientId() !== clientId) {
+                    DebugLogger.debug(`WebSocket onclose event triggered - ignored because the client id changed. Old: ${clientId}, new: ${this.clientIdService.getClientId()}`);
+                    return;
+                }
+                if (this.connectionReady.value) {
+                    this.connectionReady.next(false);
+                }
             },
             onerror: (e) => console.error('WebSocket error:', e),
         });
     }
-    disconnect() {
+    disconnectForTest() {
         var _a;
         this.connectionReady.next(false);
         (_a = this.socket) === null || _a === void 0 ? void 0 : _a.close(4998);
@@ -51148,7 +51078,7 @@ class SocketManager {
     }
     onMessage(messagesStr) {
         if (messagesStr === 'connectionReady') {
-            DebugLogger.debug('Got socket message: connectionReady');
+            DebugLogger.debug(`Got socket message: connectionReady ${this.clientIdService.getClientId()}`);
             this.onConnectionReady();
             return;
         }
@@ -51159,7 +51089,7 @@ class SocketManager {
                 continue;
             }
             this.seenMessageIds.add(message.messageId);
-            DebugLogger.debug(new Date(), 'Got socket message: ', JSON.stringify(message, null, 2));
+            DebugLogger.debug(new Date(), `Got socket message: (${this.clientIdService.getClientId()})`, JSON.stringify(message, null, 2));
             this.messageNotificationWrapper(() => {
                 this.webSocketObserver.next(message);
             });

package/dist/internal-common/src/public-types/pagination.public-types.d.ts

@@ -32,7 +32,6 @@ export declare class Pagination<ReturnType> {
     private navigatingToLastPage;
     private lastElement;
     private goToFirstPage;
-    private static compareValues;
     private compareObjects;
     private dataReceived;
     private doNewQuery;

package/dist/internal-common/src/utils/object.d.ts

@@ -1,5 +1,7 @@
-export declare function getInPath(obj: Readonly<any> | undefined, path: string, delimiter?: string): any;
+/** Returns a value by the `path`. Works with array indexes, like a.b[0]. */
+export declare function getInPath(obj: unknown, path: string): any;
 export declare function isDateObject(value: unknown): value is Date;
+/** Sets a value by path . Does not support array indexes. */
 export declare function setInPath(obj: object, path: string, value: unknown, delimiter?: string): void;
 export declare function deleteInPath(obj: object, path: string, delimiter?: string): void;
 export declare function replaceKeyInMap<K, T>(map: Map<K, T | undefined>, a: K, b: K): void;
@@ -10,3 +12,5 @@ export declare function isEmpty(a: unknown): boolean;
 export declare function omit<T extends object, K extends (string | number | symbol)[]>(object: T | null | undefined, ...paths: K): Pick<T, Exclude<keyof T, K[number]>>;
 /** Creates a deep copy of the object. Copies all Date, Map, Set fields. */
 export declare function cloneDeep<T>(value: T): T;
+/** Compares 2 values. 'null' and 'undefined' values are considered equal and are less than any other values. */
+export declare function compareValues(a: any, b: any): number;

package/dist/internal-common/src/utils/squid-private-options.d.ts

@@ -1,12 +1,5 @@
 export declare function setSquidPrivateOption<T = unknown>(optionName: string, value: T): void;
 export declare function getSquidPrivateOption<T = unknown>(optionName: string): T | undefined;
-/*** Set of constants for private options. */
-/**
- * When set to 'true' (boolean), the RPC manager in Squid uses new 'fetch' based
- * HTTP client instead of axios library.
- * The option will be removed after the migration is tested and all issues are fixed.
- */
-export declare const SQUID_PRIVATE_OPTION_USE_FETCH_IN_RPC_MANAGER = "useFetchInRpcManager";
 /**
  * When set to 'true' (boolean), the Graphql client in Squid uses new 'fetch' based
  * HTTP client instead of cross-fetch library.

package/dist/typescript-client/src/client-id.service.d.ts

@@ -19,7 +19,7 @@ export declare class ClientIdService {
     observeClientTooOld(): Observable<void>;
     /**  there was a long-term disconnection of the socket */
     notifyClientTooOld(): void;
-    notifyClientReadyToBeRegenerated(): void;
+    notifyClientNotTooOld(): void;
     observeClientReadyToBeRegenerated(): Observable<void>;
     getClientId(): ClientId;
     isClientTooOld(): boolean;

package/dist/typescript-client/src/document-store.d.ts

@@ -1,12 +1,11 @@
-import { FieldType, Query, SquidDocId, SquidDocument } from './public-types';
+import { Query, SquidDocId, SquidDocument } from './public-types';
 export declare class DocumentStore {
     private readonly squidDocIdToDoc;
     saveDocument(squidDocId: SquidDocId, properties: SquidDocument | undefined): SquidDocument | undefined;
     hasData(squidDocId: SquidDocId): boolean;
     getDocument(squidDocId: SquidDocId): SquidDocument;
     getDocumentOrUndefined(squidDocId: SquidDocId): SquidDocument | undefined;
-    compareValues(a: FieldType | undefined, b: FieldType | undefined): number;
-    compareSquidDocs(a: SquidDocument, b: SquidDocument, sortFieldNames: string[], sortOrders: ('asc' | 'desc')[]): number;
+    private compareSquidDocs;
     group(sortedDocs: SquidDocument[], sortFieldNames: string[]): SquidDocument[][];
     sortAndLimitDocs(docIdSet: Set<SquidDocId>, query: Query): Array<SquidDocument>;
     private removeInternalProperties;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@squidcloud/client",
-  "version": "1.0.187",
+  "version": "1.0.188",
   "description": "A typescript implementation of the Squid client",
   "main": "dist/cjs/index.js",
   "types": "dist/typescript-client/src/index.d.ts",
@@ -39,7 +39,6 @@
     "@supercharge/promise-pool": "^2.3.2",
     "ajv": "^8.11.2",
     "ajv-formats": "^2.1.1",
-    "axios": "^1.6.2",
     "bufferutil": "^4.0.7",
     "cross-fetch": "^3.1.5",
     "date-fns": "^2.30.0",