@l-v-yonsama/multi-platform-database-drivers 0.1.31 → 0.1.33

package/built/src/{db/drivers → drivers}/MySQLDriver.js

@@ -2,10 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MySQLDriver = void 0;
 const tslib_1 = require("tslib");
-const BaseDriver_1 = require("./BaseDriver");
 const mysql = tslib_1.__importStar(require("mysql2/promise"));
-const resource_1 = require("../resource");
 const enum_values_1 = require("enum-values");
+const MySQLColumnType_1 = require("../types/MySQLColumnType");
+const BaseDriver_1 = require("./BaseDriver");
+const resource_1 = require("../resource");
+const types_1 = require("../types");
 class MySQLDriver extends BaseDriver_1.BaseDriver {
     constructor(conRes) {
         super(conRes);
@@ -14,9 +16,9 @@ class MySQLDriver extends BaseDriver_1.BaseDriver {
         if (resolver) {
             resolver.hints.list.push({ table: fieldInfo.orgTable });
         }
-        const name = enum_values_1.EnumValues.getNameFromValue(resource_1.MySQLColumnType, resource_1.MySQLColumnType.parseByFieldInfo(fieldInfo));
-        const key = new resource_1.RdhKey(fieldInfo.name, resource_1.GeneralColumnType.parse(name), super.resolveColumnComment(fieldInfo.orgName, resolver));
-        if (key.type === resource_1.GeneralColumnType.UNKNOWN) {
+        const name = enum_values_1.EnumValues.getNameFromValue(MySQLColumnType_1.MySQLColumnType, MySQLColumnType_1.MySQLColumnType.parseByFieldInfo(fieldInfo));
+        const key = new resource_1.RdhKey(fieldInfo.name, types_1.GeneralColumnType.parse(name), super.resolveColumnComment(fieldInfo.orgName, resolver));
+        if (key.type === types_1.GeneralColumnType.UNKNOWN) {
         }
         return key;
     }
@@ -69,7 +71,7 @@ class MySQLDriver extends BaseDriver_1.BaseDriver {
                     binds = options.binds;
                 }
                 let resolver;
-                if (options && options.needs_column_resolve === true) {
+                if (options && options.needsColumnResolve === true) {
                     resolver = this.createColumnResolver(sql);
                 }
                 const [rows, fields] = yield this.client.execute(sql, binds);
@@ -144,7 +146,7 @@ class MySQLDriver extends BaseDriver_1.BaseDriver {
             return list;
         });
     }
-    getInfomationSchemas(options) {
+    getInfomationSchemas() {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (!this.conRes) {
                 return [];
@@ -152,33 +154,16 @@ class MySQLDriver extends BaseDriver_1.BaseDriver {
             const dbResources = new Array();
             const dbDatabase = new resource_1.DbDatabase(this.conRes.database);
             dbResources.push(dbDatabase);
-            let progress = 10;
-            if (options.progress_callback) {
-                options.progress_callback(`${dbResources.length} Databases found.`, progress);
-            }
             const dbSchemas = yield this.getSchemas(dbDatabase);
             dbSchemas.forEach((res) => {
                 dbDatabase.addChild(res);
             });
             this.resetDefaultSchema(dbDatabase);
-            progress = 30;
-            if (options.progress_callback) {
-                options.progress_callback(`${dbSchemas.length} Schemas found.`, progress);
-            }
-            const incrPerSchema = Math.round(20 / dbSchemas.length);
             for (const dbSchema of dbSchemas) {
                 const dbTables = yield this.getTables(dbSchema);
                 dbTables.forEach((res) => dbSchema.addChild(res));
-                if (options.progress_callback) {
-                    progress += incrPerSchema;
-                    options.progress_callback(`${dbTables.length} Tables found in Schema[${dbSchema.getName()}].`, progress);
-                }
             }
             for (const dbSchema of dbSchemas) {
-                if (options.progress_callback) {
-                    progress += incrPerSchema;
-                    options.progress_callback(`Commnets finding now... in Schema[${dbSchema.getName()}].`, progress);
-                }
                 for (const dbTable of dbSchema.getChildren()) {
                     const dbColumns = yield this.getColumns(dbSchema.getName(), dbTable);
                     dbColumns.forEach((res) => dbTable.addChild(res));
@@ -228,8 +213,8 @@ class MySQLDriver extends BaseDriver_1.BaseDriver {
             FROM INFORMATION_SCHEMA.COLUMNS
             WHERE TABLE_SCHEMA = ? AND  TABLE_NAME = ?`, { binds });
             return rdh.rows.map((r) => {
-                const type_name = enum_values_1.EnumValues.getNameFromValue(resource_1.MySQLColumnType, resource_1.MySQLColumnType.parse(r.values.col_type));
-                const res = new resource_1.DbColumn(r.values.name, resource_1.GeneralColumnType.parse(type_name), {
+                const type_name = enum_values_1.EnumValues.getNameFromValue(MySQLColumnType_1.MySQLColumnType, MySQLColumnType_1.MySQLColumnType.parse(r.values.col_type));
+                const res = new resource_1.DbColumn(r.values.name, types_1.GeneralColumnType.parse(type_name), {
                     nullable: r.values.nullable === 1,
                     key: r.values.col_key,
                     default: r.values.col_default,

package/built/src/drivers/MySQLDriver.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"MySQLDriver.js","sourceRoot":"","sources":["../../../src/drivers/MySQLDriver.ts"],"names":[],"mappings":"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"}

package/built/src/{db/drivers → drivers}/PostgresDriver.d.ts

@@ -1,6 +1,6 @@
-import { BaseDriver, RequestSqlOptions } from './BaseDriver';
-import { ResultSetDataHolder, RdhKey, DbConnection, DbDatabase, DbSchema, DbTable, DbColumn, ColumnResolver, TableRows, SchemaAndTableHints } from '../resource';
 import { default as pg } from 'pg';
+import { BaseDriver, RequestSqlOptions } from './BaseDriver';
+import { ColumnResolver, DbColumn, DbConnection, DbDatabase, DbSchema, DbTable, RdhKey, ResultSetDataHolder, SchemaAndTableHints, TableRows } from '../resource';
 export declare class PostgresDriver extends BaseDriver {
     private pool;
     constructor(conRes: DbConnection);
@@ -9,10 +9,7 @@ export declare class PostgresDriver extends BaseDriver {
     test(with_connect?: boolean): Promise<string>;
     requestSql(sql: string, options?: RequestSqlOptions): Promise<ResultSetDataHolder>;
     countTables(tables: SchemaAndTableHints, options: any): Promise<TableRows[]>;
-    getInfomationSchemas(options: {
-        progress_callback?: Function | undefined;
-        params?: any;
-    }): Promise<Array<DbDatabase>>;
+    getInfomationSchemas(): Promise<Array<DbDatabase>>;
     asyncGetDatabases(connection_database: string): Promise<Array<DbDatabase>>;
     getSchemas(dbDatabase: DbDatabase): Promise<Array<DbSchema>>;
     getTables(dbSchema: DbSchema): Promise<Array<DbTable>>;

package/built/src/{db/drivers → drivers}/PostgresDriver.js

@@ -2,10 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PostgresDriver = void 0;
 const tslib_1 = require("tslib");
-const BaseDriver_1 = require("./BaseDriver");
-const resource_1 = require("../resource");
 const pg_1 = tslib_1.__importDefault(require("pg"));
 const enum_values_1 = require("enum-values");
+const PostgresColumnType_1 = require("../types/PostgresColumnType");
+const BaseDriver_1 = require("./BaseDriver");
+const resource_1 = require("../resource");
+const types_1 = require("../types");
 class PostgresDriver extends BaseDriver_1.BaseDriver {
     constructor(conRes) {
         super(conRes);
@@ -14,8 +16,8 @@ class PostgresDriver extends BaseDriver_1.BaseDriver {
         if (fieldInfo.name.startsWith('c_')) {
             console.log(`★ ${fieldInfo.name.substring(2).toUpperCase()} = ${fieldInfo.dataTypeID}`);
         }
-        const name = enum_values_1.EnumValues.getNameFromValue(resource_1.PostgresColumnType, resource_1.PostgresColumnType.parse(fieldInfo.dataTypeID));
-        const key = new resource_1.RdhKey(fieldInfo.name, resource_1.GeneralColumnType.parse(name), super.resolveColumnComment(fieldInfo.name, resolver));
+        const name = enum_values_1.EnumValues.getNameFromValue(PostgresColumnType_1.PostgresColumnType, PostgresColumnType_1.PostgresColumnType.parse(fieldInfo.dataTypeID));
+        const key = new resource_1.RdhKey(fieldInfo.name, types_1.GeneralColumnType.parse(name), super.resolveColumnComment(fieldInfo.name, resolver));
         return key;
     }
     connectSub() {
@@ -74,7 +76,7 @@ class PostgresDriver extends BaseDriver_1.BaseDriver {
                 const results = yield this.pool.query(sql, binds);
                 if (results) {
                     let resolver;
-                    if (options && options.needs_column_resolve === true) {
+                    if (options && options.needsColumnResolve === true) {
                         resolver = this.createColumnResolver(sql);
                     }
                     const fields = results.fields;
@@ -124,7 +126,7 @@ class PostgresDriver extends BaseDriver_1.BaseDriver {
             return list;
         });
     }
-    getInfomationSchemas(options) {
+    getInfomationSchemas() {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (!this.conRes) {
                 return [];
@@ -255,8 +257,8 @@ class PostgresDriver extends BaseDriver_1.BaseDriver {
     order by
       col.ordinal_position`, { binds });
             return rdh.rows.map((r) => {
-                const type_name = enum_values_1.EnumValues.getNameFromValue(resource_1.PostgresColumnType, resource_1.PostgresColumnType.parse(r.values.col_type));
-                const res = new resource_1.DbColumn(r.values.qname, resource_1.GeneralColumnType.parse(type_name), {
+                const type_name = enum_values_1.EnumValues.getNameFromValue(PostgresColumnType_1.PostgresColumnType, PostgresColumnType_1.PostgresColumnType.parse(r.values.col_type));
+                const res = new resource_1.DbColumn(r.values.qname, types_1.GeneralColumnType.parse(type_name), {
                     nullable: r.values.nullable === 1,
                     key: r.values.col_key,
                     default: r.values.col_default,

package/built/src/drivers/PostgresDriver.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"PostgresDriver.js","sourceRoot":"","sources":["../../../src/drivers/PostgresDriver.ts"],"names":[],"mappings":"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"}

package/built/src/drivers/RedisDriver.d.ts

@@ -0,0 +1,16 @@
+import { Redis } from 'ioredis';
+import { BaseDriver, RequestSqlOptions } from './BaseDriver';
+import { DbConnection, DbDatabase, DbKey, RedisKeyParams, ResultSetDataHolder } from '../resource';
+import { RedisKeyType, ScanParams } from '../types';
+export declare class RedisDriver extends BaseDriver {
+    client: Redis | undefined;
+    databases: number;
+    constructor(conRes: DbConnection);
+    connectSub(): Promise<string>;
+    test(with_connect?: boolean): Promise<string>;
+    requestSql(sql: string, options?: RequestSqlOptions): Promise<ResultSetDataHolder>;
+    scan(params: ScanParams): Promise<DbKey<RedisKeyParams>[]>;
+    getValueByKey(client: Redis, key: string, type: RedisKeyType): Promise<any>;
+    getInfomationSchemas(): Promise<Array<DbDatabase>>;
+    closeSub(): Promise<string>;
+}

package/built/src/{db/drivers → drivers}/RedisDriver.js

@@ -2,11 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RedisDriver = void 0;
 const tslib_1 = require("tslib");
-const BaseDriver_1 = require("./BaseDriver");
-const DbResource_1 = require("../resource/DbResource");
 const ioredis_1 = require("ioredis");
+const BaseDriver_1 = require("./BaseDriver");
 const resource_1 = require("../resource");
-const RedisRequest_1 = require("../../service/request/RedisRequest");
+const types_1 = require("../types");
 class RedisDriver extends BaseDriver_1.BaseDriver {
     constructor(conRes) {
         super(conRes);
@@ -90,117 +89,59 @@ class RedisDriver extends BaseDriver_1.BaseDriver {
             return resource_1.ResultSetDataHolder.createEmpty();
         });
     }
-    countTables(tables, options) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            return new Array();
-        });
-    }
-    executeCommand(req) {
+    scan(params) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            let ret = '';
-            if (!this.client) {
-                return ret;
-            }
-            yield this.client.select(req.index);
-            let r = '';
-            switch (req.command) {
-                case RedisRequest_1.RedisCommandType.GetValue:
-                    {
-                        r = yield this.getValueByKey(this.client, req.key, req.type);
-                        const ttl = yield this.client.ttl(req.key);
-                        ret = new DbResource_1.DbKey(req.key, req.type, ttl);
-                        if (ret.ttl > 0) {
-                            ret.ttlConfirmationDatetime = new Date().getTime();
-                        }
-                        ret.val = r;
+            const { target, limit, withValue, keyword } = params;
+            const keys = yield new Promise((resolve) => {
+                this.client.select(target);
+                const stream = this.client.scanStream({
+                    match: keyword,
+                    count: limit,
+                });
+                const keys = [];
+                stream.on('data', (resultKeys) => {
+                    resultKeys.forEach((key) => {
+                        keys.push(key);
+                    });
+                    if (keys.length > limit) {
+                        stream.close();
                     }
-                    break;
-                case RedisRequest_1.RedisCommandType.SetValue:
-                    if (req.options) {
-                        yield this.client.set(req.key, req.options.val);
+                });
+                stream.on('end', () => {
+                    if (keys.length > limit) {
+                        keys.splice(limit - 1, keys.length - limit);
                     }
-                    break;
-                case RedisRequest_1.RedisCommandType.Flushall:
-                    ret = yield this.client.flushall();
-                    break;
-                case RedisRequest_1.RedisCommandType.Flushdb:
-                    ret = yield this.client.flushdb();
-                    break;
-                case RedisRequest_1.RedisCommandType.Dbsize:
-                    ret = yield this.client.dbsize();
-                    break;
-                case RedisRequest_1.RedisCommandType.Info:
-                    ret = yield this.client.info(req.options.section);
-                    break;
-                default:
-                    console.error('undefined.', req.command);
-                    break;
-            }
-            return ret;
-        });
-    }
-    scan(db_index, key, count, withValue, progressCallback) {
-        return new Promise((resolve) => {
-            const currentClient = this.client;
-            this.client.select(db_index);
-            const stream = this.client.scanStream({
-                match: key,
-                count,
-            });
-            const ret = new Array();
-            stream.on('data', (resultKeys) => {
-                resultKeys.forEach((key) => {
-                    ret.push(new DbResource_1.DbKey(key));
+                    resolve(keys);
                 });
-                if (progressCallback) {
-                    progressCallback('Key scanning now.', Math.round((ret.length * 100) / count));
-                }
-                if (ret.length > count) {
-                    stream.close();
-                }
             });
-            stream.on('end', () => {
-                if (progressCallback) {
-                    progressCallback('Key scanning done. get type and ttl.', 80);
+            const promises = keys.map((key) => tslib_1.__awaiter(this, void 0, void 0, function* () {
+                const type = (yield this.client.type(key));
+                const ttl = yield this.client.ttl(key);
+                let val;
+                if (withValue) {
+                    val = yield this.getValueByKey(this.client, key, type);
                 }
-                if (ret.length > count) {
-                    ret.splice(count - 1, ret.length - count);
-                }
-                const parallels = [];
-                ret.forEach((keyRes) => {
-                    parallels.push((() => tslib_1.__awaiter(this, void 0, void 0, function* () {
-                        keyRes.type = resource_1.RedisKeyType.parse(yield currentClient.type(keyRes.getName()));
-                        keyRes.ttl = yield currentClient.ttl(keyRes.getName());
-                        if (keyRes.ttl > 0) {
-                            keyRes.ttlConfirmationDatetime = new Date().getTime();
-                        }
-                        if (withValue) {
-                            keyRes.val = yield this.getValueByKey(currentClient, keyRes.getName(), keyRes.type);
-                        }
-                    }))());
+                return new resource_1.DbKey(key, {
+                    type,
+                    ttl,
+                    val,
                 });
-                (() => tslib_1.__awaiter(this, void 0, void 0, function* () {
-                    yield Promise.all(parallels);
-                    if (progressCallback) {
-                        progressCallback('Key scanning done.', 100);
-                    }
-                    resolve(ret);
-                }))();
-            });
+            }));
+            return yield Promise.all(promises);
         });
     }
     getValueByKey(client, key, type) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             switch (type) {
-                case resource_1.RedisKeyType.string:
+                case types_1.RedisKeyType.string:
                     return yield client.get(key);
-                case resource_1.RedisKeyType.list:
+                case types_1.RedisKeyType.list:
                     return yield client.lrange(key, 0, -1);
-                case resource_1.RedisKeyType.set:
+                case types_1.RedisKeyType.set:
                     return yield client.smembers(key);
-                case resource_1.RedisKeyType.zset:
+                case types_1.RedisKeyType.zset:
                     return yield client.zrange(key, 0, -1);
-                case resource_1.RedisKeyType.hash:
+                case types_1.RedisKeyType.hash:
                     return yield client.hgetall(key);
                 default:
                     console.log('whattype??', type);
@@ -208,7 +149,7 @@ class RedisDriver extends BaseDriver_1.BaseDriver {
             return undefined;
         });
     }
-    getInfomationSchemas(options) {
+    getInfomationSchemas() {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (!this.conRes) {
                 return [];
@@ -222,13 +163,13 @@ class RedisDriver extends BaseDriver_1.BaseDriver {
                 const keys = parseInt(m[2], 10);
                 const expires = parseInt(m[3], 10);
                 const avg_ttl = parseInt(m[4], 10);
-                const dbRes = new DbResource_1.RedisDatabase(db, keys, expires, avg_ttl);
+                const dbRes = new resource_1.RedisDatabase(db, keys, expires, avg_ttl);
                 dbResources.push(dbRes);
             }
             for (let i = 0; i < this.databases; i++) {
                 const name = `${i}`;
                 if (!dbResources.some((r) => r.getName() === name)) {
-                    const dbRes = new DbResource_1.RedisDatabase(name, 0, 0, 0);
+                    const dbRes = new resource_1.RedisDatabase(name, 0, 0, 0);
                     dbResources.push(dbRes);
                 }
             }

package/built/src/drivers/RedisDriver.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"RedisDriver.js","sourceRoot":"","sources":["../../../src/drivers/RedisDriver.ts"],"names":[],"mappings":"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"}

package/built/src/{db/drivers → drivers}/index.d.ts

@@ -1,5 +1,7 @@
 export * from './AwsS3Driver';
+export * from './AwsSQSDriver';
 export * from './BaseDriver';
 export * from './MySQLDriver';
 export * from './PostgresDriver';
 export * from './RedisDriver';
+export * from './DBDriverResolver';

package/built/src/{db/drivers → drivers}/index.js

@@ -2,8 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 tslib_1.__exportStar(require("./AwsS3Driver"), exports);
+tslib_1.__exportStar(require("./AwsSQSDriver"), exports);
 tslib_1.__exportStar(require("./BaseDriver"), exports);
 tslib_1.__exportStar(require("./MySQLDriver"), exports);
 tslib_1.__exportStar(require("./PostgresDriver"), exports);
 tslib_1.__exportStar(require("./RedisDriver"), exports);
+tslib_1.__exportStar(require("./DBDriverResolver"), exports);
 //# sourceMappingURL=index.js.map

package/built/src/drivers/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/drivers/index.ts"],"names":[],"mappings":";;;AAAA,wDAA8B;AAC9B,yDAA+B;AAC/B,uDAA6B;AAC7B,wDAA8B;AAC9B,2DAAiC;AACjC,wDAA8B;AAC9B,6DAAmC"}

package/built/src/index.d.ts

@@ -1,3 +1,3 @@
-export * from './db';
+export * from './drivers';
+export * from './resource';
 export * from './types';
-export * from './service';

package/built/src/index.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
-tslib_1.__exportStar(require("./db"), exports);
+tslib_1.__exportStar(require("./drivers"), exports);
+tslib_1.__exportStar(require("./resource"), exports);
 tslib_1.__exportStar(require("./types"), exports);
-tslib_1.__exportStar(require("./service"), exports);
 //# sourceMappingURL=index.js.map

package/built/src/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;AAAA,+CAAqB;AACrB,kDAAwB;AACxB,oDAA0B"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;AAAA,oDAA0B;AAC1B,qDAA2B;AAC3B,kDAAwB"}

package/built/src/{db/resource → resource}/DbResource.d.ts

@@ -1,4 +1,4 @@
-import { DBType, ResourceType, RedisKeyType, GeneralColumnType, ODBCVendorType } from './types';
+import { DBType, GeneralColumnType, RedisKeyType, ResourceType } from '../types';
 export interface Proposal {
     s?: string;
     t?: string;
@@ -39,7 +39,7 @@ export declare class DbResource {
     hasChildren(): boolean;
     containsResource(filter: string): boolean;
     clearChildren(): void;
-    getChildByName(name: string, options?: {
+    getChildByName(name: string | RegExp, options?: {
         unwrapQuote?: boolean;
         resouceType?: ResourceType;
     }): DbResource;
@@ -87,7 +87,6 @@ export interface ConnectionSetting {
 export declare class DbConnection extends DbResource implements ConnectionSetting {
     property: Map<string, object>;
     dbType: any;
-    odbcVendorType: ODBCVendorType;
     host: string;
     port: number;
     user: string;
@@ -138,16 +137,30 @@ export declare class DbTable extends DbResource {
     toString(): string;
     static deserialize(db: DbDatabase, schema: DbSchema, json: any): DbTable;
 }
-export declare class DbKey extends DbResource {
-    type: RedisKeyType;
-    ttl: number;
-    ttlConfirmationDatetime: number | undefined;
-    ttl_remain: number | undefined;
-    val: any;
-    constructor(name: string, type?: RedisKeyType, ttl?: number);
-    toString(): string;
+export declare class DbKey<T extends RedisKeyParams | S3KeyParams | SQSMessageParams = any> extends DbResource {
+    readonly params: T;
+    constructor(name: string, params: T);
     static deserialize(json: any): DbKey;
 }
+export type RedisKeyParams = {
+    type: RedisKeyType;
+    ttl: number;
+    val?: any;
+    base64?: string;
+};
+export type S3KeyParams = {
+    outputFilePath?: string;
+    lastModified: Date;
+    etag: string;
+    size: number;
+    storageClass: string;
+    base64?: string;
+};
+export type SQSMessageParams = {
+    body: string;
+    receiptHandle: string;
+    md5OfBody: string;
+};
 export declare class DbColumn extends DbResource {
     readonly colType: GeneralColumnType;
     readonly nullable: boolean;
@@ -156,7 +169,6 @@ export declare class DbColumn extends DbResource {
     readonly extra: any;
     constructor(name: string, colType: GeneralColumnType, params: any, comment?: string);
     static deserialize(db: DbDatabase, schema: DbSchema, table: DbTable, json: any): DbColumn;
-    getGeneralType(): string;
     toString(): string;
 }
 export declare class DbS3Bucket extends DbResource {
@@ -164,30 +176,15 @@ export declare class DbS3Bucket extends DbResource {
     isInProgress: boolean;
     refreshed?: Date;
     constructor(name?: string, created?: Date);
-    getDir(key: string): DbS3Key | undefined;
     static deserialize(db: DbDatabase, json: any): DbS3Bucket;
 }
+export declare class DbSQSQueue extends DbResource {
+    readonly url: string;
+    readonly attributes?: Record<string, string>;
+    constructor(name: string, url: string, attributes?: Record<string, string>);
+    static deserialize(db: DbDatabase, json: any): DbSQSQueue;
+}
 export declare class DbS3Owner extends DbResource {
     constructor(id: string, name?: string);
     static deserialize(db: DbDatabase, json: any): DbS3Owner;
 }
-export interface S3KeySearchResult {
-    prefix?: string;
-    list: Array<DbS3Key>;
-    ContinuationToken: string;
-    error_message?: string;
-}
-export declare class DbS3Key extends DbResource {
-    output_file_path?: string;
-    is_dir: boolean;
-    isInProgress: boolean;
-    refreshed?: Date;
-    updated?: Date;
-    etag?: string;
-    size?: number;
-    storage_class?: string;
-    base64?: string;
-    constructor(name: string, is_dir?: boolean);
-    toString(): string;
-    static deserialize(json: any): DbS3Key;
-}