@nocobase/database 2.0.0-alpha.40 → 2.0.0-alpha.42

package/lib/fields/index.d.ts

@@ -27,7 +27,6 @@ import { UidFieldOptions } from './uid-field';
 import { UUIDFieldOptions } from './uuid-field';
 import { VirtualFieldOptions } from './virtual-field';
 import { NanoidFieldOptions } from './nanoid-field';
-import { EncryptionField } from './encryption-field';
 import { UnixTimestampFieldOptions } from './unix-timestamp-field';
 import { DateOnlyFieldOptions } from './date-only-field';
 import { DatetimeNoTzFieldOptions } from './datetime-no-tz-field';
@@ -59,7 +58,6 @@ export * from './uid-field';
 export * from './uuid-field';
 export * from './virtual-field';
 export * from './nanoid-field';
-export * from './encryption-field';
 export * from './unix-timestamp-field';
 export * from './snowflake-id-field';
-export type FieldOptions = BaseFieldOptions | StringFieldOptions | IntegerFieldOptions | FloatFieldOptions | DecimalFieldOptions | DoubleFieldOptions | RealFieldOptions | JsonFieldOptions | JsonbFieldOptions | BooleanFieldOptions | RadioFieldOptions | TextFieldOptions | VirtualFieldOptions | ArrayFieldOptions | SetFieldOptions | TimeFieldOptions | DateFieldOptions | DatetimeTzFieldOptions | DatetimeNoTzFieldOptions | DateOnlyFieldOptions | UnixTimestampFieldOptions | UidFieldOptions | UUIDFieldOptions | NanoidFieldOptions | PasswordFieldOptions | ContextFieldOptions | BelongsToFieldOptions | HasOneFieldOptions | HasManyFieldOptions | BelongsToManyFieldOptions | EncryptionField | SnowflakeIdFieldOptions;
+export type FieldOptions = BaseFieldOptions | StringFieldOptions | IntegerFieldOptions | FloatFieldOptions | DecimalFieldOptions | DoubleFieldOptions | RealFieldOptions | JsonFieldOptions | JsonbFieldOptions | BooleanFieldOptions | RadioFieldOptions | TextFieldOptions | VirtualFieldOptions | ArrayFieldOptions | SetFieldOptions | TimeFieldOptions | DateFieldOptions | DatetimeTzFieldOptions | DatetimeNoTzFieldOptions | DateOnlyFieldOptions | UnixTimestampFieldOptions | UidFieldOptions | UUIDFieldOptions | NanoidFieldOptions | PasswordFieldOptions | ContextFieldOptions | BelongsToFieldOptions | HasOneFieldOptions | HasManyFieldOptions | BelongsToManyFieldOptions | SnowflakeIdFieldOptions;

package/lib/fields/index.js

@@ -49,7 +49,6 @@ __reExport(fields_exports, require("./uid-field"), module.exports);
 __reExport(fields_exports, require("./uuid-field"), module.exports);
 __reExport(fields_exports, require("./virtual-field"), module.exports);
 __reExport(fields_exports, require("./nanoid-field"), module.exports);
-__reExport(fields_exports, require("./encryption-field"), module.exports);
 __reExport(fields_exports, require("./unix-timestamp-field"), module.exports);
 __reExport(fields_exports, require("./snowflake-id-field"), module.exports);
 // Annotate the CommonJS export names for ESM import in node:
@@ -80,7 +79,6 @@ __reExport(fields_exports, require("./snowflake-id-field"), module.exports);
   ...require("./uuid-field"),
   ...require("./virtual-field"),
   ...require("./nanoid-field"),
-  ...require("./encryption-field"),
   ...require("./unix-timestamp-field"),
   ...require("./snowflake-id-field")
 });

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@nocobase/database",
-  "version": "2.0.0-alpha.40",
+  "version": "2.0.0-alpha.42",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "AGPL-3.0",
   "dependencies": {
-    "@nocobase/logger": "2.0.0-alpha.40",
-    "@nocobase/utils": "2.0.0-alpha.40",
+    "@nocobase/logger": "2.0.0-alpha.42",
+    "@nocobase/utils": "2.0.0-alpha.42",
     "async-mutex": "^0.3.2",
     "chalk": "^4.1.1",
     "cron-parser": "4.4.0",
@@ -39,5 +39,5 @@
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/database"
   },
-  "gitHead": "dfb9fd33f43e91e676ae7b1f1a595bc38b7c20d2"
+  "gitHead": "9e96dd78d0c1445c8da76863e30f046be5b48d90"
 }

package/lib/fields/encryption-field/encryption-field.d.ts

@@ -1,20 +0,0 @@
-/**
- * This file is part of the NocoBase (R) project.
- * Copyright (c) 2020-2024 NocoBase Co., Ltd.
- * Authors: NocoBase Team.
- *
- * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
- * For more information, please refer to: https://www.nocobase.com/agreement.
- */
-import { DataTypes } from 'sequelize';
-import { BaseColumnFieldOptions, Field } from '../field';
-export interface EncryptionFieldOptions extends BaseColumnFieldOptions {
-    type: 'encryption';
-    hidden?: boolean;
-}
-export declare class EncryptionField extends Field {
-    get dataType(): DataTypes.StringDataTypeConstructor;
-    init(): void;
-    bind(): void;
-    unbind(): void;
-}

package/lib/fields/encryption-field/encryption-field.js

@@ -1,110 +0,0 @@
-/**
- * This file is part of the NocoBase (R) project.
- * Copyright (c) 2020-2024 NocoBase Co., Ltd.
- * Authors: NocoBase Team.
- *
- * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
- * For more information, please refer to: https://www.nocobase.com/agreement.
- */
-
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var encryption_field_exports = {};
-__export(encryption_field_exports, {
-  EncryptionField: () => EncryptionField
-});
-module.exports = __toCommonJS(encryption_field_exports);
-var import_sequelize = require("sequelize");
-var import_EncryptionError = require("./errors/EncryptionError");
-var import_utils = require("./utils");
-var import_field = require("../field");
-const _EncryptionField = class _EncryptionField extends import_field.Field {
-  get dataType() {
-    return import_sequelize.DataTypes.STRING;
-  }
-  init() {
-    (0, import_utils.aesCheckKey)();
-    const { name, iv } = this.options;
-    this.writeListener = async (model) => {
-      (0, import_utils.aesCheckKey)();
-      if (!model.changed(name)) {
-        return;
-      }
-      const value = model.get(name);
-      if (value !== void 0 && value !== null) {
-        try {
-          const encrypted = await (0, import_utils.aesEncrypt)(value, iv);
-          model.set(name, encrypted);
-        } catch (error) {
-          console.error(error);
-          if (error instanceof import_EncryptionError.EncryptionError) {
-            throw error;
-          } else {
-            throw new import_EncryptionError.EncryptionError("Encryption failed");
-          }
-        }
-      } else {
-        model.set(name, null);
-      }
-    };
-    this.findListener = async (instances, options) => {
-      (0, import_utils.aesCheckKey)();
-      instances = Array.isArray(instances) ? instances : [instances];
-      await Promise.all(
-        instances.map(async (instance) => {
-          var _a;
-          const value = (_a = instance.get) == null ? void 0 : _a.call(instance, name);
-          if (value !== void 0 && value !== null) {
-            try {
-              instance.set(name, await (0, import_utils.aesDecrypt)(value, iv));
-            } catch (error) {
-              console.error(error);
-              if (error instanceof import_EncryptionError.EncryptionError) {
-                throw error;
-              } else {
-                throw new import_EncryptionError.EncryptionError(
-                  "Decryption failed, the environment variable `ENCRYPTION_FIELD_KEY` may be incorrect"
-                );
-              }
-            }
-          }
-          return instance;
-        })
-      );
-    };
-  }
-  bind() {
-    super.bind();
-    this.on("afterFind", this.findListener);
-    this.on("beforeSave", this.writeListener);
-    this.on("beforeBulkCreate", this.writeListener);
-  }
-  unbind() {
-    super.unbind();
-    this.off("afterFind", this.findListener);
-    this.off("beforeSave", this.writeListener);
-    this.off("beforeBulkCreate", this.writeListener);
-  }
-};
-__name(_EncryptionField, "EncryptionField");
-let EncryptionField = _EncryptionField;
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  EncryptionField
-});

package/lib/fields/encryption-field/errors/EncryptionError.d.ts

@@ -1,11 +0,0 @@
-/**
- * This file is part of the NocoBase (R) project.
- * Copyright (c) 2020-2024 NocoBase Co., Ltd.
- * Authors: NocoBase Team.
- *
- * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
- * For more information, please refer to: https://www.nocobase.com/agreement.
- */
-export declare class EncryptionError extends Error {
-    constructor(message?: string, options?: ErrorOptions);
-}

package/lib/fields/encryption-field/errors/EncryptionError.js

@@ -1,44 +0,0 @@
-/**
- * This file is part of the NocoBase (R) project.
- * Copyright (c) 2020-2024 NocoBase Co., Ltd.
- * Authors: NocoBase Team.
- *
- * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
- * For more information, please refer to: https://www.nocobase.com/agreement.
- */
-
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var EncryptionError_exports = {};
-__export(EncryptionError_exports, {
-  EncryptionError: () => EncryptionError
-});
-module.exports = __toCommonJS(EncryptionError_exports);
-const _EncryptionError = class _EncryptionError extends Error {
-  constructor(message, options) {
-    super(message, options);
-    this.name = "EncryptionError";
-  }
-};
-__name(_EncryptionError, "EncryptionError");
-let EncryptionError = _EncryptionError;
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  EncryptionError
-});

package/lib/fields/encryption-field/index.d.ts

@@ -1,11 +0,0 @@
-/**
- * This file is part of the NocoBase (R) project.
- * Copyright (c) 2020-2024 NocoBase Co., Ltd.
- * Authors: NocoBase Team.
- *
- * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
- * For more information, please refer to: https://www.nocobase.com/agreement.
- */
-export * from './encryption-field';
-export * from './utils';
-export * from './errors/EncryptionError';

package/lib/fields/encryption-field/index.js

@@ -1,34 +0,0 @@
-/**
- * This file is part of the NocoBase (R) project.
- * Copyright (c) 2020-2024 NocoBase Co., Ltd.
- * Authors: NocoBase Team.
- *
- * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
- * For more information, please refer to: https://www.nocobase.com/agreement.
- */
-
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var encryption_field_exports = {};
-module.exports = __toCommonJS(encryption_field_exports);
-__reExport(encryption_field_exports, require("./encryption-field"), module.exports);
-__reExport(encryption_field_exports, require("./utils"), module.exports);
-__reExport(encryption_field_exports, require("./errors/EncryptionError"), module.exports);
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  ...require("./encryption-field"),
-  ...require("./utils"),
-  ...require("./errors/EncryptionError")
-});

package/lib/fields/encryption-field/utils.d.ts

@@ -1,6 +0,0 @@
-export declare function aesEncrypt(text: string, ivString?: string): Promise<unknown>;
-export declare function aesDecrypt(encrypted: string, ivString?: string): Promise<unknown>;
-export declare function aesEncryptSync(text: string, ivString?: string): string;
-export declare function aseDecryptSync(encrypted: string, ivString?: string): string;
-export declare function aesCheckKey(): void;
-export declare function checkValueAndIv(type: 'Decrypt' | 'Encrypt', value: string, iv: string): void;

package/lib/fields/encryption-field/utils.js

@@ -1,152 +0,0 @@
-/**
- * This file is part of the NocoBase (R) project.
- * Copyright (c) 2020-2024 NocoBase Co., Ltd.
- * Authors: NocoBase Team.
- *
- * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
- * For more information, please refer to: https://www.nocobase.com/agreement.
- */
-
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key2 of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key2) && key2 !== except)
-        __defProp(to, key2, { get: () => from[key2], enumerable: !(desc = __getOwnPropDesc(from, key2)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var utils_exports = {};
-__export(utils_exports, {
-  aesCheckKey: () => aesCheckKey,
-  aesDecrypt: () => aesDecrypt,
-  aesEncrypt: () => aesEncrypt,
-  aesEncryptSync: () => aesEncryptSync,
-  aseDecryptSync: () => aseDecryptSync,
-  checkValueAndIv: () => checkValueAndIv
-});
-module.exports = __toCommonJS(utils_exports);
-var import_crypto = __toESM(require("crypto"));
-var import_EncryptionError = require("./errors/EncryptionError");
-const algorithm = "aes-256-cbc";
-const keyString = process.env.ENCRYPTION_FIELD_KEY || "";
-const defaultIvString = process.env.ENCRYPTION_FIELD_IV || "Vc53-4G(rTi0vg@a";
-const key = Buffer.from(keyString, "utf8");
-function aesEncrypt(text, ivString = defaultIvString) {
-  checkValueAndIv("Encrypt", text, ivString);
-  return new Promise((resolve, reject) => {
-    const iv = Buffer.from(ivString, "utf8");
-    const cipher = import_crypto.default.createCipheriv(algorithm, key, iv);
-    let encrypted = "";
-    cipher.setEncoding("hex");
-    cipher.on("data", (chunk) => {
-      encrypted += chunk;
-    });
-    cipher.on("end", () => {
-      resolve(encrypted);
-    });
-    cipher.on("error", (err) => {
-      reject(err);
-    });
-    cipher.write(text);
-    cipher.end();
-  });
-}
-__name(aesEncrypt, "aesEncrypt");
-function aesDecrypt(encrypted, ivString = defaultIvString) {
-  checkValueAndIv("Decrypt", encrypted, ivString);
-  return new Promise((resolve, reject) => {
-    const iv = Buffer.from(ivString, "utf8");
-    const decipher = import_crypto.default.createDecipheriv(algorithm, key, iv);
-    let decrypted = "";
-    decipher.setEncoding("utf8");
-    decipher.on("data", (chunk) => {
-      decrypted += chunk;
-    });
-    decipher.on("end", () => {
-      resolve(decrypted);
-    });
-    decipher.on("error", (err) => {
-      reject(err);
-    });
-    decipher.write(encrypted, "hex");
-    decipher.end();
-  });
-}
-__name(aesDecrypt, "aesDecrypt");
-function aesEncryptSync(text, ivString = defaultIvString) {
-  checkValueAndIv("Encrypt", text, ivString);
-  const iv = Buffer.from(ivString, "utf8");
-  const cipher = import_crypto.default.createCipheriv(algorithm, key, iv);
-  let encrypted = cipher.update(text, "utf8", "hex");
-  encrypted += cipher.final("hex");
-  return encrypted;
-}
-__name(aesEncryptSync, "aesEncryptSync");
-function aseDecryptSync(encrypted, ivString = defaultIvString) {
-  checkValueAndIv("Decrypt", encrypted, ivString);
-  const iv = Buffer.from(ivString, "utf8");
-  const decipher = import_crypto.default.createDecipheriv(algorithm, key, iv);
-  let decrypted = decipher.update(encrypted, "hex", "utf8");
-  decrypted += decipher.final("utf8");
-  return decrypted;
-}
-__name(aseDecryptSync, "aseDecryptSync");
-function aesCheckKey() {
-  if (!keyString) {
-    throw new import_EncryptionError.EncryptionError("The environment variable `ENCRYPTION_FIELD_KEY` is required, please set it");
-  }
-  if (typeof keyString !== "string") {
-    throw new import_EncryptionError.EncryptionError("The environment variable `ENCRYPTION_FIELD_KEY` must be a string");
-  }
-  if (keyString.length !== 32) {
-    throw new import_EncryptionError.EncryptionError("The environment variable `ENCRYPTION_FIELD_KEY` must be a 32-character string");
-  }
-}
-__name(aesCheckKey, "aesCheckKey");
-function checkValueAndIv(type, value, iv) {
-  const msg = `${type} Failed: `;
-  if (typeof value !== "string") {
-    throw new import_EncryptionError.EncryptionError(msg + "The value must be a string, but got " + typeof value);
-  }
-  if (type === "Decrypt") {
-    if (value.length % 2 !== 0) {
-      throw new import_EncryptionError.EncryptionError(msg + `The encrypted value is invalid, not a hex string. The value is "${value}"`);
-    }
-  }
-  if (typeof iv !== "string") {
-    throw new import_EncryptionError.EncryptionError(msg + "The `iv` must be a string, but got " + typeof iv);
-  }
-  if (iv.length !== 16) {
-    throw new import_EncryptionError.EncryptionError(msg + "The `iv` must be a 16-character string");
-  }
-}
-__name(checkValueAndIv, "checkValueAndIv");
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  aesCheckKey,
-  aesDecrypt,
-  aesEncrypt,
-  aesEncryptSync,
-  aseDecryptSync,
-  checkValueAndIv
-});