@cloudbase/database 0.9.19 → 0.9.21

package/dist/esm/utils/type.d.ts

@@ -1,13 +1,13 @@
-export declare const getType: (x: any) => string;
-export declare const isObject: <T extends object>(x: any) => x is T;
-export declare const isString: (x: any) => x is string;
-export declare const isNumber: (x: any) => x is number;
-export declare const isPromise: <T extends Promise<any> = Promise<any>>(x: any) => x is T;
-declare type AnyFn = (...args: any[]) => any;
-export declare const isFunction: <T extends AnyFn = AnyFn>(x: any) => x is T;
-export declare const isArray: <T extends any[] = any[]>(x: any) => x is T;
-export declare const isDate: (x: any) => x is Date;
-export declare const isRegExp: (x: any) => x is RegExp;
-export declare const isInternalObject: (x: any) => boolean;
-export declare const isPlainObject: (obj: any) => obj is object;
-export {};
+export declare const getType: (x: any) => string;
+export declare const isObject: <T extends object>(x: any) => x is T;
+export declare const isString: (x: any) => x is string;
+export declare const isNumber: (x: any) => x is number;
+export declare const isPromise: <T extends Promise<any> = Promise<any>>(x: any) => x is T;
+declare type AnyFn = (...args: any[]) => any;
+export declare const isFunction: <T extends AnyFn = AnyFn>(x: any) => x is T;
+export declare const isArray: <T extends any[] = any[]>(x: any) => x is T;
+export declare const isDate: (x: any) => x is Date;
+export declare const isRegExp: (x: any) => x is RegExp;
+export declare const isInternalObject: (x: any) => boolean;
+export declare const isPlainObject: (obj: any) => obj is object;
+export {};

package/dist/esm/utils/type.js

@@ -1,20 +1,20 @@
-import { InternalSymbol } from './symbol';
-export var getType = function (x) { return Object.prototype.toString.call(x).slice(8, -1).toLowerCase(); };
-export var isObject = function (x) { return getType(x) === 'object'; };
-export var isString = function (x) { return getType(x) === 'string'; };
-export var isNumber = function (x) { return getType(x) === 'number'; };
-export var isPromise = function (x) { return getType(x) === 'promise'; };
-export var isFunction = function (x) { return typeof x === 'function'; };
-export var isArray = function (x) { return Array.isArray(x); };
-export var isDate = function (x) { return getType(x) === 'date'; };
-export var isRegExp = function (x) { return getType(x) === 'regexp'; };
-export var isInternalObject = function (x) { return x && (x._internalType instanceof InternalSymbol); };
-export var isPlainObject = function (obj) {
-    if (typeof obj !== 'object' || obj === null)
-        return false;
-    var proto = obj;
-    while (Object.getPrototypeOf(proto) !== null) {
-        proto = Object.getPrototypeOf(proto);
-    }
-    return Object.getPrototypeOf(obj) === proto;
-};
+import { InternalSymbol } from './symbol';
+export var getType = function (x) { return Object.prototype.toString.call(x).slice(8, -1).toLowerCase(); };
+export var isObject = function (x) { return getType(x) === 'object'; };
+export var isString = function (x) { return getType(x) === 'string'; };
+export var isNumber = function (x) { return getType(x) === 'number'; };
+export var isPromise = function (x) { return getType(x) === 'promise'; };
+export var isFunction = function (x) { return typeof x === 'function'; };
+export var isArray = function (x) { return Array.isArray(x); };
+export var isDate = function (x) { return getType(x) === 'date'; };
+export var isRegExp = function (x) { return getType(x) === 'regexp'; };
+export var isInternalObject = function (x) { return x && (x._internalType instanceof InternalSymbol); };
+export var isPlainObject = function (obj) {
+    if (typeof obj !== 'object' || obj === null)
+        return false;
+    var proto = obj;
+    while (Object.getPrototypeOf(proto) !== null) {
+        proto = Object.getPrototypeOf(proto);
+    }
+    return Object.getPrototypeOf(obj) === proto;
+};

package/dist/esm/utils/utils.d.ts

@@ -1,4 +1,4 @@
-import { Db } from '../';
-export declare const sleep: (ms?: number) => Promise<unknown>;
-export declare const autoCount: (domain?: string) => number;
-export declare function getWsInstance(db: Db): any;
+import { Db } from '../';
+export declare const sleep: (ms?: number) => Promise<unknown>;
+export declare const autoCount: (domain?: string) => number;
+export declare function getWsInstance(db: Db): any;

package/dist/esm/utils/utils.js

@@ -1,33 +1,33 @@
-import { Db } from '../';
-export var sleep = function (ms) {
-    if (ms === void 0) { ms = 0; }
-    return new Promise(function (r) { return setTimeout(r, ms); });
-};
-var counters = {};
-export var autoCount = function (domain) {
-    if (domain === void 0) { domain = 'any'; }
-    if (!counters[domain]) {
-        counters[domain] = 0;
-    }
-    return counters[domain]++;
-};
-var wsList = {};
-export function getWsInstance(db) {
-    if (!Db.wsClientClass) {
-        throw new Error('to use realtime you must import realtime module first');
-    }
-    var env = db.config.env;
-    if (!wsList[env]) {
-        wsList[env] = new Db.wsClientClass({
-            context: {
-                appConfig: {
-                    docSizeLimit: 1000,
-                    realtimePingInterval: 10000,
-                    realtimePongWaitTimeout: 5000,
-                    request: new Db.reqClass(db.config)
-                }
-            }
-        });
-    }
-    return wsList[env];
-}
+import { Db } from '../';
+export var sleep = function (ms) {
+    if (ms === void 0) { ms = 0; }
+    return new Promise(function (r) { return setTimeout(r, ms); });
+};
+var counters = {};
+export var autoCount = function (domain) {
+    if (domain === void 0) { domain = 'any'; }
+    if (!counters[domain]) {
+        counters[domain] = 0;
+    }
+    return counters[domain]++;
+};
+var wsList = {};
+export function getWsInstance(db) {
+    if (!Db.wsClientClass) {
+        throw new Error('to use realtime you must import realtime module first');
+    }
+    var env = db.config.env;
+    if (!wsList[env]) {
+        wsList[env] = new Db.wsClientClass({
+            context: {
+                appConfig: {
+                    docSizeLimit: 1000,
+                    realtimePingInterval: 10000,
+                    realtimePongWaitTimeout: 5000,
+                    request: new Db.reqClass(db.config)
+                }
+            }
+        });
+    }
+    return wsList[env];
+}

package/dist/esm/validate.d.ts

@@ -1 +1 @@
-export {};
+export {};

package/dist/esm/validate.js

@@ -1,57 +1,57 @@
-import { ErrorCode, WhereFilterOpList, OrderDirectionList, FieldType } from './constant';
-import { Util } from './util';
-var Validate = (function () {
-    function Validate() {
-    }
-    Validate.isGeopoint = function (point, degree) {
-        if (Util.whichType(degree) !== FieldType.Number) {
-            throw new Error('Geo Point must be number type');
-        }
-        var degreeAbs = Math.abs(degree);
-        if (point === 'latitude' && degreeAbs > 90) {
-            throw new Error('latitude should be a number ranges from -90 to 90');
-        }
-        else if (point === 'longitude' && degreeAbs > 180) {
-            throw new Error('longitude should be a number ranges from -180 to 180');
-        }
-        return true;
-    };
-    Validate.isInteger = function (param, num) {
-        if (!Number.isInteger(num)) {
-            throw new Error(param + ErrorCode.IntergerError);
-        }
-        return true;
-    };
-    Validate.isFieldOrder = function (direction) {
-        if (OrderDirectionList.indexOf(direction) === -1) {
-            throw new Error(ErrorCode.DirectionError);
-        }
-        return true;
-    };
-    Validate.isFieldPath = function (path) {
-        if (!/^[a-zA-Z0-9-_\.]/.test(path)) {
-            throw new Error();
-        }
-        return true;
-    };
-    Validate.isOperator = function (op) {
-        if (WhereFilterOpList.indexOf(op) === -1) {
-            throw new Error(ErrorCode.OpStrError);
-        }
-        return true;
-    };
-    Validate.isCollName = function (name) {
-        if (!/^[a-zA-Z0-9]([a-zA-Z0-9-_]){1,32}$/.test(name)) {
-            throw new Error(ErrorCode.CollNameError);
-        }
-        return true;
-    };
-    Validate.isDocID = function (docId) {
-        if (!/^([a-fA-F0-9]){24}$/.test(docId)) {
-            throw new Error(ErrorCode.DocIDError);
-        }
-        return true;
-    };
-    return Validate;
-}());
-export { Validate };
+import { ErrorCode, WhereFilterOpList, OrderDirectionList, FieldType } from './constant';
+import { Util } from './util';
+var Validate = (function () {
+    function Validate() {
+    }
+    Validate.isGeopoint = function (point, degree) {
+        if (Util.whichType(degree) !== FieldType.Number) {
+            throw new Error('Geo Point must be number type');
+        }
+        var degreeAbs = Math.abs(degree);
+        if (point === 'latitude' && degreeAbs > 90) {
+            throw new Error('latitude should be a number ranges from -90 to 90');
+        }
+        else if (point === 'longitude' && degreeAbs > 180) {
+            throw new Error('longitude should be a number ranges from -180 to 180');
+        }
+        return true;
+    };
+    Validate.isInteger = function (param, num) {
+        if (!Number.isInteger(num)) {
+            throw new Error(param + ErrorCode.IntergerError);
+        }
+        return true;
+    };
+    Validate.isFieldOrder = function (direction) {
+        if (OrderDirectionList.indexOf(direction) === -1) {
+            throw new Error(ErrorCode.DirectionError);
+        }
+        return true;
+    };
+    Validate.isFieldPath = function (path) {
+        if (!/^[a-zA-Z0-9-_\.]/.test(path)) {
+            throw new Error();
+        }
+        return true;
+    };
+    Validate.isOperator = function (op) {
+        if (WhereFilterOpList.indexOf(op) === -1) {
+            throw new Error(ErrorCode.OpStrError);
+        }
+        return true;
+    };
+    Validate.isCollName = function (name) {
+        if (!/^[a-zA-Z0-9]([a-zA-Z0-9-_]){1,32}$/.test(name)) {
+            throw new Error(ErrorCode.CollNameError);
+        }
+        return true;
+    };
+    Validate.isDocID = function (docId) {
+        if (!/^([a-fA-F0-9]){24}$/.test(docId)) {
+            throw new Error(ErrorCode.DocIDError);
+        }
+        return true;
+    };
+    return Validate;
+}());
+export { Validate };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/database",
-  "version": "0.9.19",
+  "version": "0.9.21",
   "description": "database for (node.)js sdk ",
   "main": "dist/commonjs/index.js",
   "module": "dist/esm/index.js",

package/src/document.ts

@@ -301,10 +301,7 @@ export class DocumentReference {
           const documents = Util.formatResDocumentData(res.data.list)
           callback(0, {
             data: documents,
-            requestId: res.requestId,
-            total: res.TotalCount,
-            limit: res.Limit,
-            offset: res.Offset
+            requestId: res.requestId
           })
         }
       })

package/src/query.ts

@@ -204,9 +204,9 @@ export class Query {
             data: documents,
             requestId: res.requestId
           }
-          if (res.TotalCount) result.total = res.TotalCount
-          if (res.Limit) result.limit = res.Limit
-          if (res.Offset) result.offset = res.Offset
+          if (res.total) result.total = res.total
+          if (res.limit) result.limit = res.limit
+          if (res.offset) result.offset = res.offset
           callback(0, result)
         }
       })

package/src/transaction/document.ts

@@ -168,7 +168,7 @@ export class DocumentReference {
     if ((res as TcbError).code) throw res
     return {
       ...res,
-      updated: EJSON.parse((res as SetResult).updated),
+      updated: EJSON.parse((res as SetResult).updated as any) as any,
       upserted: (res as SetResult).upserted
         ? JSON.parse((res as SetResult).upserted as string)
         : null
@@ -214,7 +214,7 @@ export class DocumentReference {
     if ((res as TcbError).code) throw res
     return {
       ...res,
-      deleted: EJSON.parse((res as DeleteResult).deleted)
+      deleted: EJSON.parse((res as DeleteResult).deleted as any) as any
     }
   }
 }

package/dist/commonjs/ObjectId/index.d.ts

@@ -1,11 +0,0 @@
-export declare class ObjectId {
-    id: string;
-    constructor({ id }?: {
-        id?: string;
-    });
-    readonly _internalType: import("../utils/symbol").InternalSymbol;
-    parse(): {
-        $oid: string;
-    };
-}
-export declare function ObjectIdConstructor(opt: any): ObjectId;

package/dist/commonjs/ObjectId/index.js

@@ -1,21 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const symbol_1 = require("../helper/symbol");
-class ObjectId {
-    constructor({ id = '' } = {}) {
-        this.id = id;
-    }
-    get _internalType() {
-        return symbol_1.SYMBOL_OBJECTID;
-    }
-    parse() {
-        return {
-            $oid: this.id
-        };
-    }
-}
-exports.ObjectId = ObjectId;
-function ObjectIdConstructor(opt) {
-    return new ObjectId(opt);
-}
-exports.ObjectIdConstructor = ObjectIdConstructor;

package/dist/commonjs/realtime/error.d.ts

@@ -1,7 +0,0 @@
-import { IResponseMessageErrorMsg } from '../typings/realtime';
-export declare class RealtimeErrorMessageError extends Error {
-    isRealtimeErrorMessageError: boolean;
-    payload: IResponseMessageErrorMsg;
-    constructor(serverErrorMsg: IResponseMessageErrorMsg);
-}
-export declare const isRealtimeErrorMessageError: (e: any) => e is RealtimeErrorMessageError;

package/dist/commonjs/realtime/error.js

@@ -1,11 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-class RealtimeErrorMessageError extends Error {
-    constructor(serverErrorMsg) {
-        super(`Watch Error ${JSON.stringify(serverErrorMsg.msgData)} (requestid: ${serverErrorMsg.requestId})`);
-        this.isRealtimeErrorMessageError = true;
-        this.payload = serverErrorMsg;
-    }
-}
-exports.RealtimeErrorMessageError = RealtimeErrorMessageError;
-exports.isRealtimeErrorMessageError = (e) => e && e.isRealtimeErrorMessageError;

package/dist/commonjs/realtime/listener.d.ts

@@ -1,14 +0,0 @@
-import { VirtualWebSocketClient } from './virtual-websocket-client';
-import { IRealtimeListenerConstructorOptions, DBRealtimeListener } from '../typings/index';
-interface IRealtimeListenerOptions extends IRealtimeListenerConstructorOptions {
-    close: () => void;
-    debug?: boolean;
-    virtualClient?: VirtualWebSocketClient;
-}
-export declare class RealtimeListener implements DBRealtimeListener {
-    close: () => void;
-    onChange: (res: any) => void;
-    onError: (error: any) => void;
-    constructor(options: IRealtimeListenerOptions);
-}
-export {};

package/dist/commonjs/realtime/listener.js

@@ -1,17 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-class RealtimeListener {
-    constructor(options) {
-        this.close = options.close;
-        this.onChange = options.onChange;
-        this.onError = options.onError;
-        if (options.debug) {
-            Object.defineProperty(this, 'virtualClient', {
-                get: () => {
-                    return options.virtualClient;
-                }
-            });
-        }
-    }
-}
-exports.RealtimeListener = RealtimeListener;

package/dist/commonjs/realtime/message.d.ts

@@ -1,3 +0,0 @@
-import { IResponseMessage, IResponseMessageInitEventMsg } from '../typings/realtime';
-export declare function genRequestId(prefix?: string): string;
-export declare function isInitEventMessage(msg: IResponseMessage): msg is IResponseMessageInitEventMsg;

package/dist/commonjs/realtime/message.js

@@ -1,10 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-function genRequestId(prefix = '') {
-    return `${prefix ? `${prefix}_` : ''}${+new Date()}_${Math.random()}`;
-}
-exports.genRequestId = genRequestId;
-function isInitEventMessage(msg) {
-    return msg.msgType === 'INIT_EVENT';
-}
-exports.isInitEventMessage = isInitEventMessage;

package/dist/commonjs/realtime/snapshot.d.ts

@@ -1,16 +0,0 @@
-import { ISingleDBEvent, SnapshotType, ISnapshot } from '../typings/index';
-interface ISnapshotConstructorOptions {
-    id: number;
-    docChanges: ISingleDBEvent[];
-    docs: Record<string, any>[];
-    type?: SnapshotType;
-    msgType?: String;
-}
-export declare class Snapshot implements ISnapshot {
-    id: number;
-    docChanges: ISingleDBEvent[];
-    docs: Record<string, any>[];
-    type?: 'init';
-    constructor(options: ISnapshotConstructorOptions);
-}
-export {};

package/dist/commonjs/realtime/snapshot.js

@@ -1,42 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-class Snapshot {
-    constructor(options) {
-        const { id, docChanges, docs, msgType, type } = options;
-        let cachedDocChanges;
-        let cachedDocs;
-        Object.defineProperties(this, {
-            id: {
-                get: () => id,
-                enumerable: true
-            },
-            docChanges: {
-                get: () => {
-                    if (!cachedDocChanges) {
-                        cachedDocChanges = JSON.parse(JSON.stringify(docChanges));
-                    }
-                    return cachedDocChanges;
-                },
-                enumerable: true
-            },
-            docs: {
-                get: () => {
-                    if (!cachedDocs) {
-                        cachedDocs = JSON.parse(JSON.stringify(docs));
-                    }
-                    return cachedDocs;
-                },
-                enumerable: true
-            },
-            msgType: {
-                get: () => msgType,
-                enumerable: true
-            },
-            type: {
-                get: () => type,
-                enumerable: true
-            }
-        });
-    }
-}
-exports.Snapshot = Snapshot;

package/dist/commonjs/realtime/virtual-websocket-client.d.ts

@@ -1,63 +0,0 @@
-import { IResponseMessage } from '../typings/realtime';
-import { RealtimeListener } from './listener';
-import { IWSSendOptions } from './websocket-client';
-import { IWatchOptions } from '../typings/index';
-interface IVirtualWebSocketClientConstructorOptions extends IWatchOptions {
-    envId?: string;
-    collectionName: string;
-    query: string;
-    limit?: number;
-    orderBy?: Record<string, string>;
-    send: <T = any>(opts: IWSSendOptions) => Promise<T>;
-    login: (envId?: string, refresh?: boolean) => Promise<any>;
-    isWSConnected: () => boolean;
-    onceWSConnected: () => Promise<void>;
-    getWaitExpectedTimeoutLength: () => number;
-    onWatchStart: (client: VirtualWebSocketClient, queryID: string) => void;
-    onWatchClose: (client: VirtualWebSocketClient, queryID: string) => void;
-    debug?: boolean;
-}
-export declare class VirtualWebSocketClient {
-    watchId: string;
-    private envId?;
-    private collectionName;
-    private query;
-    private limit;
-    private orderBy;
-    private send;
-    private login;
-    private isWSConnected;
-    private onceWSConnected;
-    private getWaitExpectedTimeoutLength;
-    private onWatchStart;
-    private onWatchClose;
-    private debug?;
-    listener: RealtimeListener;
-    private watchStatus;
-    private _availableRetries;
-    private _ackTimeoutId?;
-    private _initWatchPromise?;
-    private _rebuildWatchPromise?;
-    private sessionInfo?;
-    private _waitExpectedTimeoutId?;
-    constructor(options: IVirtualWebSocketClientConstructorOptions);
-    private _login;
-    private initWatch;
-    private rebuildWatch;
-    private handleWatchEstablishmentError;
-    private closeWatch;
-    private scheduleSendACK;
-    private clearACKSchedule;
-    private sendACK;
-    private handleCommonError;
-    private useRetryTicket;
-    private handleServerEvents;
-    private _handleServerEvents;
-    private _postHandleServerEventsValidityCheck;
-    private clearWaitExpectedEvent;
-    onMessage(msg: IResponseMessage): void;
-    closeWithError(error: any): void;
-    pause(): void;
-    resume(): Promise<void>;
-}
-export {};