@cloudbase/database 0.9.17-beta → 0.9.19

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,2 +1,4 @@
-export declare const sleep: (ms?: number) => Promise<unknown>;
-export declare const autoCount: (domain?: string) => number;
+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,12 +1,33 @@
-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]++;
-};
+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,9 +1,12 @@
 {
   "name": "@cloudbase/database",
-  "version": "0.9.17-beta",
+  "version": "0.9.19",
   "description": "database for (node.)js sdk ",
   "main": "dist/commonjs/index.js",
   "module": "dist/esm/index.js",
+  "publishConfig": {
+    "tag": "next"
+  },
   "scripts": {
     "eslint": "eslint \"./**/*.ts\"",
     "eslint-fix": "eslint --fix \"./**/*.ts\"",

package/src/aggregate.ts

@@ -1,6 +1,7 @@
 import { Db } from './index'
 import { EJSON } from 'bson'
 import { QuerySerializer } from './serializer/query'
+import { Point } from './geo'
 export default class Aggregation {
   _db: any
   _request: any
@@ -70,6 +71,16 @@ export default class Aggregation {
   }
 
   geoNear(param) {
+    if (param.query) {
+      param.query = QuerySerializer.encode(param.query)
+    }
+    if (param.distanceMultiplier && typeof (param.distanceMultiplier) === 'number') {
+      param.distanceMultiplier = param.distanceMultiplier
+    }
+    
+    if(param.near) {
+      param.near = new Point(param.near.longitude, param.near.latitude).toJSON()
+    }
     return this._pipe('geoNear', param)
   }
 

package/src/document.ts

@@ -5,8 +5,8 @@ import { UpdateSerializer } from './serializer/update'
 import { serialize } from './serializer/datatype'
 import { UpdateCommand } from './commands/update'
 import { IWatchOptions, DBRealtimeListener } from './typings/index'
-import { RealtimeWebSocketClient } from './realtime/websocket-client'
 import { QueryType } from './constant'
+import { getWsInstance } from './utils/utils'
 
 /**
  * 文档模块
@@ -333,20 +333,9 @@ export class DocumentReference {
    * 监听单个文档
    */
   watch = (options: IWatchOptions): DBRealtimeListener => {
-    if (!Db.ws) {
-      Db.ws = new RealtimeWebSocketClient({
-        context: {
-          appConfig: {
-            docSizeLimit: 1000,
-            realtimePingInterval: 10000,
-            realtimePongWaitTimeout: 5000,
-            request: this.request
-          }
-        }
-      })
-    }
+    const ws = getWsInstance(this._db)
 
-    return (Db.ws as RealtimeWebSocketClient).watch({
+    return ws.watch({
       ...options,
       envId: this._db.config.env,
       collectionName: this._coll,
@@ -354,6 +343,5 @@ export class DocumentReference {
         _id: this.id
       })
     })
-    // })
   }
 }

package/src/index.ts

@@ -65,6 +65,8 @@ export class Db {
 
   static wsClass: any
 
+  static wsClientClass: any
+
   // 创建签名的工具函数，由jssdk传入
   static createSign: Function
 

package/src/query.ts

@@ -10,8 +10,8 @@ import { QuerySerializer } from './serializer/query'
 import { UpdateSerializer } from './serializer/update'
 // import { WSClient } from "./websocket/wsclient"
 import { IWatchOptions, DBRealtimeListener } from './typings/index'
-import { RealtimeWebSocketClient } from './realtime/websocket-client'
 import { ErrorCode } from './constant'
+import { getWsInstance } from './utils/utils'
 
 interface GetRes {
   data: any[]
@@ -449,24 +449,13 @@ export class Query {
    * 监听query对应的doc变化
    */
   watch = (options: IWatchOptions): DBRealtimeListener => {
-    if (!Db.ws) {
-      Db.ws = new RealtimeWebSocketClient({
-        context: {
-          appConfig: {
-            docSizeLimit: 1000,
-            realtimePingInterval: 10000,
-            realtimePongWaitTimeout: 5000,
-            request: this._request
-          }
-        }
-      })
-    }
+    const ws = getWsInstance(this._db)
 
-    return (Db.ws as RealtimeWebSocketClient).watch({
+    return ws.watch({
       ...options,
       envId: this._db.config.env,
       collectionName: this._coll,
-      query: JSON.stringify(this._fieldFilters),
+      query: JSON.stringify(this._fieldFilters || {}),
       limit: this._queryOptions.limit,
       orderBy: this._fieldOrders
         ? this._fieldOrders.reduce<Record<string, string>>((acc, cur) => {
@@ -475,7 +464,6 @@ export class Query {
           }, {})
         : undefined
     })
-    // })
   }
 
   /*

package/src/utils/utils.ts

@@ -1,3 +1,5 @@
+import { Db } from '../';
+
 export const sleep = (ms: number = 0) => new Promise(r => setTimeout(r, ms))
 
 const counters: Record<string, number> = {}
@@ -8,3 +10,29 @@ export const autoCount = (domain: string = 'any'): number => {
   }
   return counters[domain]++
 }
+
+/**
+ * 工厂模式创建 ws 实例
+ */
+const wsList = {}
+export function getWsInstance(db: Db) {
+  if(!Db.wsClientClass){
+    throw new Error('to use realtime you must import realtime module first')
+  }
+  const { env } = db.config
+
+  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/src/realtime/error.ts

@@ -1,19 +0,0 @@
-import { IResponseMessageErrorMsg } from '../typings/realtime'
-
-export class RealtimeErrorMessageError extends Error {
-  isRealtimeErrorMessageError = true
-  payload: IResponseMessageErrorMsg
-
-  constructor(serverErrorMsg: IResponseMessageErrorMsg) {
-    super(
-      `Watch Error ${JSON.stringify(serverErrorMsg.msgData)} (requestid: ${
-        serverErrorMsg.requestId
-      })`
-    )
-    this.payload = serverErrorMsg
-  }
-}
-
-export const isRealtimeErrorMessageError = (
-  e: any
-): e is RealtimeErrorMessageError => e && e.isRealtimeErrorMessageError

package/src/realtime/listener.ts

@@ -1,35 +0,0 @@
-import { VirtualWebSocketClient } from './virtual-websocket-client'
-import {
-  IRealtimeListenerConstructorOptions,
-  DBRealtimeListener
-} from '../typings/index'
-
-// =============== Realtime Listener (Public) ====================
-
-interface IRealtimeListenerOptions extends IRealtimeListenerConstructorOptions {
-  // init
-  close: () => void
-  // debug
-  debug?: boolean
-  virtualClient?: VirtualWebSocketClient
-}
-
-export class RealtimeListener implements DBRealtimeListener {
-  close: () => void
-  onChange: (res: any) => void
-  onError: (error: any) => void
-
-  constructor(options: IRealtimeListenerOptions) {
-    this.close = options.close
-    this.onChange = options.onChange
-    this.onError = options.onError
-
-    if (options.debug) {
-      Object.defineProperty(this, 'virtualClient', {
-        get: () => {
-          return options.virtualClient
-        }
-      })
-    }
-  }
-}

package/src/realtime/message.ts

@@ -1,14 +0,0 @@
-import {
-  IResponseMessage,
-  IResponseMessageInitEventMsg
-} from '../typings/realtime'
-
-export function genRequestId(prefix: string = '') {
-  return `${prefix ? `${prefix}_` : ''}${+new Date()}_${Math.random()}`
-}
-
-export function isInitEventMessage(
-  msg: IResponseMessage
-): msg is IResponseMessageInitEventMsg {
-  return msg.msgType === 'INIT_EVENT'
-}

package/src/realtime/snapshot.ts

@@ -1,60 +0,0 @@
-import { ISingleDBEvent, SnapshotType, ISnapshot } from '../typings/index'
-
-// =============== Realtime Snapshot / Change Event (Public) ====================
-
-interface ISnapshotConstructorOptions {
-  id: number
-  docChanges: ISingleDBEvent[]
-  docs: Record<string, any>[]
-  type?: SnapshotType
-  // EJSON: any
-  msgType?: String
-}
-
-export class Snapshot implements ISnapshot {
-  id!: number
-  docChanges!: ISingleDBEvent[]
-  docs!: Record<string, any>[]
-  type?: 'init'
-  // EJSON: any
-
-  constructor(options: ISnapshotConstructorOptions) {
-    const { id, docChanges, docs, msgType, type } = options
-
-    let cachedDocChanges: ISingleDBEvent[]
-    let cachedDocs: Record<string, any>[]
-
-    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
-      }
-    })
-  }
-}