@cloudbase/js-sdk 3.3.14-beta.3 → 3.3.14-beta.5

package/ai/src/index.d.ts

@@ -0,0 +1 @@
+export * from '@cloudbase/ai';

package/ai/src/index.ts

@@ -0,0 +1 @@
+export * from '@cloudbase/ai'

package/analytics/src/index.d.ts

@@ -0,0 +1,2 @@
+import cloudbase from '../../index';
+export declare const registerAnalytics: (app: typeof cloudbase) => void;

package/analytics/src/index.ts

@@ -0,0 +1,4 @@
+import { registerAnalytics as registerAnalyticsOrigin } from '@cloudbase/analytics';
+import cloudbase from '../../index';
+
+export const registerAnalytics = registerAnalyticsOrigin as (app: typeof cloudbase) => void;

package/apis/src/index.d.ts

@@ -0,0 +1 @@
+export * from '@cloudbase/apis';

package/apis/src/index.ts

@@ -0,0 +1 @@
+export * from '@cloudbase/apis'

package/app/src/index.d.ts

@@ -0,0 +1,9 @@
+import cloudbase from '@cloudbase/app';
+import { ICloudbase } from '@cloudbase/types';
+declare global {
+    interface Window {
+        cloudbase: ICloudbase;
+    }
+}
+export = cloudbase;
+export default cloudbase;

package/app/src/index.ts

@@ -0,0 +1,17 @@
+import cloudbase from '@cloudbase/app'
+import { ICloudbase } from '@cloudbase/types'
+import pkg from '@cloudbase/app/package.json'
+
+cloudbase.registerVersion(pkg.version)
+
+declare global {
+  interface Window {
+    cloudbase: ICloudbase
+  }
+}
+try {
+  ;(window as Window).cloudbase = cloudbase
+} catch (e) {}
+// @ts-ignore
+export = cloudbase
+export default cloudbase

package/auth/src/index.d.ts

@@ -0,0 +1,2 @@
+import cloudbase from '../../index';
+export declare const registerAuth: (app: typeof cloudbase) => void;

package/auth/src/index.ts

@@ -0,0 +1,8 @@
+import { registerAuth as registerAuthOrigin } from '@cloudbase/auth';
+import cloudbase from '../../index';
+
+export const registerAuth = registerAuthOrigin as (app: typeof cloudbase) => void;
+
+try {
+  (window as any).registerAuth = registerAuth
+} catch (e) {}

package/cloudrun/src/index.d.ts

@@ -0,0 +1 @@
+export * from '@cloudbase/cloudrun';

package/cloudrun/src/index.ts

@@ -0,0 +1 @@
+export * from '@cloudbase/cloudrun'

package/container/src/index.d.ts

@@ -0,0 +1,2 @@
+import cloudbase from '../../index';
+export declare const registerContainers: (app: typeof cloudbase) => void;

package/container/src/index.ts

@@ -0,0 +1,8 @@
+import { registerContainers as origin } from '@cloudbase/container';
+import cloudbase from '../../index';
+
+export const registerContainers = origin as (app:typeof cloudbase)=>void;
+
+try {
+  (window as any).registerContainers = registerContainers
+} catch (e) {}

package/database/src/index.d.ts

@@ -0,0 +1,3 @@
+import { ICloudbase } from '@cloudbase/types';
+import cloudbaseNS from '../../index';
+export declare function registerDatabase(app: ICloudbase | typeof cloudbaseNS): void;

package/database/src/index.ts

@@ -0,0 +1,486 @@
+import { Db } from '@cloudbase/database'
+import { ICloudbase } from '@cloudbase/types'
+import { ICloudbaseComponent } from '@cloudbase/types/component'
+import cloudbaseNS from '../../index'
+import { EJSON } from 'bson'
+
+declare const cloudbase: ICloudbase
+declare type QueryType = 'WHERE' | 'DOC'
+
+/**
+ * 数据库配置接口
+ */
+interface IDbConfig {
+  /** 实例 ID（可选，默认 '(default)'） */
+  instance?: string
+  /** 数据库名称（可选，默认 '(default)'） */
+  database?: string
+}
+
+interface IBaseReq extends IDbConfig {
+  collectionName: string
+  transactionId?: string
+}
+
+interface IDocumentsQueryReq extends IBaseReq {
+  query?: any
+  /** @deprecated 使用 query 替代 */
+  queryType?: QueryType
+  order?: string[]
+  offset?: number
+  limit?: number
+  projection?: Object
+}
+
+interface IDocumentsAddReq extends IBaseReq {
+  data: Object | Object[]
+}
+
+interface IDocumentsUpdateReq extends IBaseReq {
+  query: Object
+  data: Object
+  /** 是否批量更新（默认 false） */
+  multi?: boolean
+  /** 把所有更新数据转为带操作符的 */
+  merge?: boolean
+  /** 不存在时是否创建（默认 false） */
+  upsert?: boolean
+  /** 是否替换整个文档（默认 false，为 true 时替换整个文档而非合并更新） */
+  replaceMode?: boolean
+  /** @deprecated 使用 query 替代 */
+  queryType?: QueryType
+}
+
+interface IDocumentsRemoveReq extends IBaseReq {
+  query: Object
+  /** 是否批量删除（默认 false） */
+  multi?: boolean
+  /** @deprecated 使用 query 替代 */
+  queryType?: QueryType
+}
+
+interface IDocumentsCountReq extends IBaseReq {
+  query: Object
+  /** @deprecated 使用 query 替代 */
+  queryType?: QueryType
+}
+
+interface ICommonRes<T> {
+  data?: T & { code?: string }
+  requestId: string
+  code?: string
+  message?: string
+}
+
+interface IAddRes {
+  /** 单条插入时返回的文档 ID（批量插入时不返回） */
+  _id?: string
+  /** 批量插入时返回的文档 ID 列表 */
+  ids?: string[]
+  insertedIds: string[]
+}
+
+interface IRunCommandsReq {
+  transactionId?: string
+  /** 命令数组，方法会将其转为 MongoDB 原生命令（EJSON 对象格式） */
+  commands: Object[]
+}
+
+const COMPONENT_NAME = 'database'
+
+const gateWayFunc = {
+  /**
+   * 过滤响应，移除不必要的字段
+   */
+  filterRes: function <T>(res: ICommonRes<T> & { header?: any; statusCode?: number }): ICommonRes<T> {
+    delete res.header
+    delete res.statusCode
+    return res
+  },
+
+  /**
+   * 展开响应数据到顶层（用于事务等场景）
+   */
+  flattenResData: function <T>(res: ICommonRes<T>): any {
+    if (typeof res.data === 'object' && res.data !== null) {
+      const result = { ...res, ...res.data }
+      delete result.data
+      return result
+    }
+    return res
+  },
+
+  /**
+   * 安全解析 EJSON
+   */
+  safeParseEJSON: function (data: any): any {
+    if (typeof data !== 'string') return data
+    try {
+      return EJSON.parse(data)
+    } catch {
+      return data
+    }
+  },
+
+  /**
+   * 构建 URL 查询参数
+   */
+  buildQueryParams: function (params: Record<string, any>): string {
+    return Object.entries(params)
+      .filter(([_, value]) => value !== undefined && value !== null && value !== '')
+      .map(([key, value]) => {
+        const stringValue = typeof value === 'object' ? JSON.stringify(value) : String(value)
+        return `${encodeURIComponent(key)}=${encodeURIComponent(stringValue)}`
+      })
+      .join('&')
+  },
+
+  /**
+   * 获取 URL 前缀
+   */
+  getUrlPrefix: function (data: IDbConfig): string {
+    const instance = data?.instance || '(default)'
+    const database = data?.database || '(default)'
+    return `/database/instances/${instance}/databases/${database}`
+  },
+
+  'database.queryDocument': async function (
+    data: IDocumentsQueryReq,
+  ): Promise<ICommonRes<{ offset?: number; limit?: number; list: any[] }>> {
+    const isQueryDoc = !!data.query?._id
+    const queryParams = gateWayFunc.buildQueryParams({
+      projection: data.projection,
+      transactionId: data.transactionId,
+      ...(isQueryDoc
+        ? {}
+        : {
+            offset: data.offset ?? 0,
+            limit: data.limit ?? 100,
+            order: data.order,
+            query: data.query ? EJSON.stringify(data.query, { relaxed: false }) : undefined,
+          }),
+    })
+
+    let url = `${gateWayFunc.getUrlPrefix(data)}/collections/${data.collectionName}/documents?${queryParams}`
+
+    // 查询单个文档
+    if (isQueryDoc) {
+      url = `${gateWayFunc.getUrlPrefix(data)}/collections/${data.collectionName}/documents/${
+        data.query._id?.$eq || data.query._id
+      }?${queryParams}`
+    }
+
+    const res = await this.gateWay({
+      url,
+      method: 'GET',
+    })
+
+    // 尝试解析 EJSON 格式的数据
+    res.data = gateWayFunc.safeParseEJSON(JSON.stringify(res.data))
+
+    if (isQueryDoc && !res.code && !res.data?.code) {
+      return {
+        ...res,
+        data: { list: [res.data] }
+      }
+    }
+
+    return gateWayFunc.filterRes(res)
+  },
+
+  'database.addDocument': async function (data: IDocumentsAddReq): Promise<ICommonRes<IAddRes>> {
+    let res = await this.gateWay({
+      url: `${gateWayFunc.getUrlPrefix(data)}/collections/${data.collectionName}/documents`,
+      method: 'POST',
+      data: {
+        data: Array.isArray(data.data) ? data.data : [data.data],
+        ...(data.transactionId && { transactionId: data.transactionId }),
+      },
+    })
+
+    if (Array.isArray(data.data)) {
+      // 数组模式（批量插入），返回 ids 列表
+      res = {
+        ...res,
+        data: {
+          ids: res.data?.insertedIds || [],
+          ...res.data,
+        },
+      }
+    } else if (res.data?.insertedIds?.[0]) {
+      // 非数组模式（单条插入），将 _id 提升到顶层
+      res = {
+        ...res,
+        data: {
+          _id: res.data.insertedIds[0],
+          ...res.data,
+        },
+      }
+    }
+
+    return gateWayFunc.filterRes(res)
+  },
+
+  'database.updateDocument': async function (
+    data: IDocumentsUpdateReq,
+  ): Promise<ICommonRes<{ matched: number; updated: number; upsert_id: string }>> {
+    const res = await this.gateWay({
+      url: `${gateWayFunc.getUrlPrefix(data)}/collections/${data.collectionName}/documents`,
+      method: 'PATCH',
+      data: {
+        query: data.query,
+        data: data.data,
+        multi: !!data.multi,
+        upsert: !!data.upsert,
+        replaceMode: !!data.replaceMode,
+        ...(data.transactionId && { transactionId: data.transactionId }),
+      },
+    })
+
+    return gateWayFunc.filterRes(res)
+  },
+
+  'database.deleteDocument': async function (data: IDocumentsRemoveReq): Promise<ICommonRes<{ deleted: number }>> {
+    const res = await this.gateWay({
+      url: `${gateWayFunc.getUrlPrefix(data)}/collections/${data.collectionName}/documents/remove`,
+      method: 'POST',
+      data: {
+        query: data.query,
+        multi: !!data.multi,
+        ...(data.transactionId && { transactionId: data.transactionId }),
+      },
+    })
+
+    return gateWayFunc.filterRes(res)
+  },
+
+  'database.countDocument': async function (data: IDocumentsCountReq): Promise<ICommonRes<{ total: number }>> {
+    const queryParams = gateWayFunc.buildQueryParams({
+      count: true,
+      query: data.query ? EJSON.stringify(data.query, { relaxed: false }) : undefined,
+    })
+
+    const res = await this.gateWay({
+      url: `${gateWayFunc.getUrlPrefix(data)}/collections/${data.collectionName}/documents?${queryParams}`,
+      method: 'GET',
+    })
+
+    return gateWayFunc.filterRes(res)
+  },
+
+  'database.addCollection': async function (data: { collectionName: string } & IDbConfig): Promise<ICommonRes<''>> {
+    const res = await this.gateWay({
+      url: `${gateWayFunc.getUrlPrefix(data)}/collections`,
+      method: 'POST',
+      data: { collectionName: data.collectionName },
+    })
+
+    return gateWayFunc.filterRes(res)
+  },
+
+  'database.aggregate': async function (
+    data: { collectionName: string; stages: { stageKey: string; stageValue: any }[] } & IDbConfig,
+  ): Promise<ICommonRes<{ list: string }>> {
+    const pipeline = data.stages.map((stage) => {
+      try {
+        // stageValue 可能是字符串或对象，统一处理
+        const value = typeof stage.stageValue === 'string' ? JSON.parse(stage.stageValue) : stage.stageValue
+        return {
+          [stage.stageKey]: EJSON.serialize(value),
+        }
+      } catch {
+        return { [stage.stageKey]: stage.stageValue }
+      }
+    })
+
+    const res = await this.gateWay({
+      url: `${gateWayFunc.getUrlPrefix(data)}/collections/${data.collectionName}/documents/aggregations`,
+      method: 'POST',
+      data: { pipeline },
+    })
+
+    // 将结果列表转为字符串格式（兼容原有逻辑）
+    if (Array.isArray(res.data?.list)) {
+      res.data.list = JSON.stringify(res.data.list.map((item: any) => JSON.stringify(item)))
+    }
+
+    return gateWayFunc.filterRes(res)
+  },
+
+  'database.startTransaction': async function (data: IDbConfig) {
+    const res = await this.gateWay({
+      url: `${gateWayFunc.getUrlPrefix(data)}/transactions`,
+      method: 'POST',
+    })
+
+    return gateWayFunc.filterRes(gateWayFunc.flattenResData(res))
+  },
+
+  'database.commitTransaction': async function (data: { transactionId: string } & IDbConfig) {
+    const res = await this.gateWay({
+      url: `${gateWayFunc.getUrlPrefix(data)}/transactions/${data.transactionId}/commit`,
+      method: 'POST',
+    })
+
+    return gateWayFunc.filterRes(res)
+  },
+
+  'database.abortTransaction': async function (data: { transactionId: string } & IDbConfig) {
+    const res = await this.gateWay({
+      url: `${gateWayFunc.getUrlPrefix(data)}/transactions/${data.transactionId}/rollback`,
+      method: 'POST',
+    })
+
+    return gateWayFunc.filterRes(res)
+  },
+
+  'database.getInTransaction': async function (data: IDocumentsQueryReq) {
+    const res = await gateWayFunc['database.queryDocument'].call(this, data)
+
+    if (typeof res.data === 'object' && res.data !== null) {
+      if (res.data?.code) {
+        return gateWayFunc.flattenResData(res)
+      }
+      return { ...res, data: JSON.stringify(res.data) as any }
+    }
+
+    return res
+  },
+
+  'database.updateDocInTransaction': async function (data: IDocumentsUpdateReq) {
+    // 尝试解析 EJSON 格式的数据
+    data.data = gateWayFunc.safeParseEJSON(data.data)
+
+    const res = await gateWayFunc['database.updateDocument'].call(this, data)
+    return gateWayFunc.flattenResData(res)
+  },
+
+  'database.deleteDocInTransaction': async function (data: IDocumentsRemoveReq) {
+    const res = await gateWayFunc['database.deleteDocument'].call(this, data)
+    return gateWayFunc.flattenResData(res)
+  },
+
+  'database.insertDocInTransaction': async function (
+    data: IDocumentsAddReq,
+  ): Promise<ICommonRes<IAddRes & { inserted?: number }>> {
+    // 尝试解析 EJSON 格式的数据
+    data.data = gateWayFunc.safeParseEJSON(data.data)
+
+    let res = await gateWayFunc['database.addDocument'].call(this, data)
+
+    if (typeof res.data === 'object' && res.data !== null) {
+      const hasId = !!res.data?._id
+      res = {
+        ...res,
+        inserted: hasId ? 1 : 0,
+        ok: hasId ? 1 : 0,
+        ...res.data,
+      } as any
+    } else {
+      res = { inserted: 0, ok: 0, ...res } as any
+    }
+
+    delete res.data
+
+    return res
+  },
+
+  'database.runCommands': async function (
+    data: IRunCommandsReq & IDbConfig,
+  ): Promise<ICommonRes<{ list: Object[][] }>> {
+    let res = await this.gateWay({
+      url: `${gateWayFunc.getUrlPrefix(data)}/commands`,
+      method: 'POST',
+      data: {
+        commands: EJSON.serialize(data.commands),
+        ...(data.transactionId && { transactionId: data.transactionId }),
+      },
+    })
+
+    if (typeof res.data === 'object' && res.data !== null) {
+      res = { ...res, ...res.data }
+      delete res.data
+      delete res.request_id
+    }
+
+    // 尝试将结果转换为普通对象
+    try {
+      res = EJSON.deserialize(res)
+    } catch {
+      // 忽略转换失败
+    }
+
+    return gateWayFunc.filterRes(res)
+  },
+}
+
+function database(dbConfig?: IDbConfig) {
+  const { adapter, runtime } = this.platform
+
+  class Req extends this.request.constructor {
+    constructor(config) {
+      super(config)
+    }
+
+    async send(action: string, data: any) {
+      let res = null
+
+      if (this.config.endPointMode === 'GATEWAY' && gateWayFunc[action]) {
+        res = await gateWayFunc[action].call(this, data)
+      } else {
+        res = await super.send(action, data)
+      }
+
+      return res
+    }
+  }
+
+  Db.reqClass = Req
+  // 未登录情况下传入空函数
+  Db.getAccessToken = this.authInstance ? this.authInstance.getAccessToken.bind(this.authInstance) : () => ''
+  Db.runtime = runtime
+  if (this.wsClientClass) {
+    Db.wsClass = adapter.wsClass
+    Db.wsClientClass = this.wsClientClass
+  }
+
+  if (!Db.ws) {
+    Db.ws = null
+  }
+
+  class NewDb extends Db {
+    constructor(config?: IDbConfig) {
+      super(config)
+    }
+
+    async runCommands(params: IRunCommandsReq): Promise<ICommonRes<{ list: Object[][] }>> {
+      let request = Db.createRequest(this.config)
+
+      return request.send('database.runCommands', params)
+    }
+  }
+
+  return new NewDb({ ...this.config, _fromApp: this, ...dbConfig })
+}
+
+const component: ICloudbaseComponent = {
+  name: COMPONENT_NAME,
+  entity: {
+    database,
+  },
+}
+try {
+  cloudbase.registerComponent(component)
+} catch (e) {}
+
+export function registerDatabase(app: ICloudbase | typeof cloudbaseNS) {
+  try {
+    app.registerComponent(component)
+  } catch (e) {
+    console.warn(e)
+  }
+}
+
+try {
+  ;(window as any).registerDatabase = registerDatabase
+} catch (e) {}

package/dist/index.cjs.js

@@ -14,7 +14,7 @@ var cloudrun_1 = require("@cloudbase/cloudrun");
 var mysql_1 = require("@cloudbase/mysql");
 var apis_1 = require("@cloudbase/apis");
 var database_1 = require("./../database");
-var version = "3.3.14-beta.3";
+var version = "3.3.14-beta.4";
 app_1.default.registerVersion(version);
 try {
     (0, auth_1.registerAuth)(app_1.default);

package/dist/index.esm.js

@@ -10,7 +10,7 @@ import { registerCloudrun } from '@cloudbase/cloudrun';
 import { registerMySQL } from '@cloudbase/mysql';
 import { registerApis } from '@cloudbase/apis';
 import { registerDatabase } from './../database';
-var version = "3.3.14-beta.3";
+var version = "3.3.14-beta.4";
 cloudbase.registerVersion(version);
 try {
     registerAuth(cloudbase);

package/functions/src/index.d.ts

@@ -0,0 +1,2 @@
+import cloudbase from '../../index';
+export declare const registerFunctions: (app: typeof cloudbase) => void;

package/functions/src/index.ts

@@ -0,0 +1,8 @@
+import { registerFunctions as registerFunctionsOrigin } from '@cloudbase/functions';
+import cloudbase from '../../index';
+
+export const registerFunctions = registerFunctionsOrigin as (app:typeof cloudbase)=>void;
+
+try {
+  (window as any).registerFunctions = registerFunctions
+} catch (e) {}