streamby-core 0.14.0 → 0.16.0

package/dist/config.d.ts

@@ -0,0 +1,18 @@
+export declare const config: {
+    s3: {
+        accessKeyId: string;
+        secretAccessKey: string;
+        region: string;
+        bucketName: string;
+    };
+    gcs: {
+        projectId: string;
+        keyFilename: string;
+        bucketName: string;
+    };
+    local: {
+        storagePath: string;
+    };
+    mongooseString: string;
+    prismaString: string;
+};

package/dist/config.js

@@ -1 +1,26 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.config = void 0;
+const dotenv_1 = __importDefault(require("dotenv"));
+dotenv_1.default.config();
+exports.config = {
+    s3: {
+        accessKeyId: process.env.AWS_ACCESS_KEY_ID || '',
+        secretAccessKey: process.env.AWS_SECRET_ACCESS_KEY || '',
+        region: process.env.AWS_REGION || 'us-east-1',
+        bucketName: process.env.AWS_BUCKET_NAME || 'streamby-dev',
+    },
+    gcs: {
+        projectId: process.env.GCS_PROJECT_ID || '',
+        keyFilename: process.env.GCS_KEY_FILENAME || '',
+        bucketName: process.env.GCS_BUCKET_NAME || 'streamby-dev',
+    },
+    local: {
+        storagePath: process.env.LOCAL_STORAGE_PATH || './uploads',
+    },
+    mongooseString: process.env.MONGOOSE_STRING || '',
+    prismaString: process.env.PRISMA_STRING || '',
+};

package/dist/db/initExportModel.d.ts

@@ -15,7 +15,7 @@ export declare function initExportModel(connection: mongoose.Connection): mongoo
     collectionName: string;
     projectId: mongoose.Types.ObjectId;
     description?: string | null | undefined;
-}> & {
+}, {}> & {
     createdAt: NativeDate;
     updatedAt: NativeDate;
 } & {
@@ -45,7 +45,7 @@ export declare function initExportModel(connection: mongoose.Connection): mongoo
     collectionName: string;
     projectId: mongoose.Types.ObjectId;
     description?: string | null | undefined;
-}>> & mongoose.FlatRecord<{
+}>, {}> & mongoose.FlatRecord<{
     createdAt: NativeDate;
     updatedAt: NativeDate;
 } & {

package/dist/db/initProjectModel.d.ts

@@ -3,6 +3,22 @@ export declare function initProjectModel(connection: mongoose.Connection): mongo
     createdAt: NativeDate;
     updatedAt: NativeDate;
 } & {
+    dbType: string;
+    name: string;
+    members: mongoose.Types.DocumentArray<{
+        userId: mongoose.Types.ObjectId;
+        role: "viewer" | "editor" | "admin";
+        archived: boolean;
+    }, mongoose.Types.Subdocument<mongoose.Types.ObjectId, any, {
+        userId: mongoose.Types.ObjectId;
+        role: "viewer" | "editor" | "admin";
+        archived: boolean;
+    }> & {
+        userId: mongoose.Types.ObjectId;
+        role: "viewer" | "editor" | "admin";
+        archived: boolean;
+    }>;
+    exports: mongoose.Types.ObjectId[];
     rootFolders: mongoose.Types.DocumentArray<{
         children: mongoose.Types.DocumentArray<{
             entries?: {} | null | undefined;
@@ -394,6 +410,15 @@ export declare function initProjectModel(connection: mongoose.Connection): mongo
         id?: string | null | undefined;
         name?: string | null | undefined;
     }>;
+    allowUpload: boolean;
+    allowSharing: boolean;
+    image?: string | null | undefined;
+    description?: string | null | undefined;
+}, {}, {}, {}, mongoose.Document<unknown, {}, {
+    createdAt: NativeDate;
+    updatedAt: NativeDate;
+} & {
+    dbType: string;
     name: string;
     members: mongoose.Types.DocumentArray<{
         userId: mongoose.Types.ObjectId;
@@ -409,14 +434,6 @@ export declare function initProjectModel(connection: mongoose.Connection): mongo
         archived: boolean;
     }>;
     exports: mongoose.Types.ObjectId[];
-    allowUpload: boolean;
-    allowSharing: boolean;
-    image?: string | null | undefined;
-    description?: string | null | undefined;
-}, {}, {}, {}, mongoose.Document<unknown, {}, {
-    createdAt: NativeDate;
-    updatedAt: NativeDate;
-} & {
     rootFolders: mongoose.Types.DocumentArray<{
         children: mongoose.Types.DocumentArray<{
             entries?: {} | null | undefined;
@@ -808,6 +825,15 @@ export declare function initProjectModel(connection: mongoose.Connection): mongo
         id?: string | null | undefined;
         name?: string | null | undefined;
     }>;
+    allowUpload: boolean;
+    allowSharing: boolean;
+    image?: string | null | undefined;
+    description?: string | null | undefined;
+}, {}> & {
+    createdAt: NativeDate;
+    updatedAt: NativeDate;
+} & {
+    dbType: string;
     name: string;
     members: mongoose.Types.DocumentArray<{
         userId: mongoose.Types.ObjectId;
@@ -823,14 +849,6 @@ export declare function initProjectModel(connection: mongoose.Connection): mongo
         archived: boolean;
     }>;
     exports: mongoose.Types.ObjectId[];
-    allowUpload: boolean;
-    allowSharing: boolean;
-    image?: string | null | undefined;
-    description?: string | null | undefined;
-}> & {
-    createdAt: NativeDate;
-    updatedAt: NativeDate;
-} & {
     rootFolders: mongoose.Types.DocumentArray<{
         children: mongoose.Types.DocumentArray<{
             entries?: {} | null | undefined;
@@ -1222,6 +1240,21 @@ export declare function initProjectModel(connection: mongoose.Connection): mongo
         id?: string | null | undefined;
         name?: string | null | undefined;
     }>;
+    allowUpload: boolean;
+    allowSharing: boolean;
+    image?: string | null | undefined;
+    description?: string | null | undefined;
+} & {
+    _id: mongoose.Types.ObjectId;
+} & {
+    __v: number;
+}, mongoose.Schema<any, mongoose.Model<any, any, any, any, any, any>, {}, {}, {}, {}, {
+    timestamps: true;
+}, {
+    createdAt: NativeDate;
+    updatedAt: NativeDate;
+} & {
+    dbType: string;
     name: string;
     members: mongoose.Types.DocumentArray<{
         userId: mongoose.Types.ObjectId;
@@ -1237,20 +1270,6 @@ export declare function initProjectModel(connection: mongoose.Connection): mongo
         archived: boolean;
     }>;
     exports: mongoose.Types.ObjectId[];
-    allowUpload: boolean;
-    allowSharing: boolean;
-    image?: string | null | undefined;
-    description?: string | null | undefined;
-} & {
-    _id: mongoose.Types.ObjectId;
-} & {
-    __v: number;
-}, mongoose.Schema<any, mongoose.Model<any, any, any, any, any, any>, {}, {}, {}, {}, {
-    timestamps: true;
-}, {
-    createdAt: NativeDate;
-    updatedAt: NativeDate;
-} & {
     rootFolders: mongoose.Types.DocumentArray<{
         children: mongoose.Types.DocumentArray<{
             entries?: {} | null | undefined;
@@ -1642,6 +1661,15 @@ export declare function initProjectModel(connection: mongoose.Connection): mongo
         id?: string | null | undefined;
         name?: string | null | undefined;
     }>;
+    allowUpload: boolean;
+    allowSharing: boolean;
+    image?: string | null | undefined;
+    description?: string | null | undefined;
+}, mongoose.Document<unknown, {}, mongoose.FlatRecord<{
+    createdAt: NativeDate;
+    updatedAt: NativeDate;
+} & {
+    dbType: string;
     name: string;
     members: mongoose.Types.DocumentArray<{
         userId: mongoose.Types.ObjectId;
@@ -1657,14 +1685,6 @@ export declare function initProjectModel(connection: mongoose.Connection): mongo
         archived: boolean;
     }>;
     exports: mongoose.Types.ObjectId[];
-    allowUpload: boolean;
-    allowSharing: boolean;
-    image?: string | null | undefined;
-    description?: string | null | undefined;
-}, mongoose.Document<unknown, {}, mongoose.FlatRecord<{
-    createdAt: NativeDate;
-    updatedAt: NativeDate;
-} & {
     rootFolders: mongoose.Types.DocumentArray<{
         children: mongoose.Types.DocumentArray<{
             entries?: {} | null | undefined;
@@ -2056,6 +2076,15 @@ export declare function initProjectModel(connection: mongoose.Connection): mongo
         id?: string | null | undefined;
         name?: string | null | undefined;
     }>;
+    allowUpload: boolean;
+    allowSharing: boolean;
+    image?: string | null | undefined;
+    description?: string | null | undefined;
+}>, {}> & mongoose.FlatRecord<{
+    createdAt: NativeDate;
+    updatedAt: NativeDate;
+} & {
+    dbType: string;
     name: string;
     members: mongoose.Types.DocumentArray<{
         userId: mongoose.Types.ObjectId;
@@ -2071,14 +2100,6 @@ export declare function initProjectModel(connection: mongoose.Connection): mongo
         archived: boolean;
     }>;
     exports: mongoose.Types.ObjectId[];
-    allowUpload: boolean;
-    allowSharing: boolean;
-    image?: string | null | undefined;
-    description?: string | null | undefined;
-}>> & mongoose.FlatRecord<{
-    createdAt: NativeDate;
-    updatedAt: NativeDate;
-} & {
     rootFolders: mongoose.Types.DocumentArray<{
         children: mongoose.Types.DocumentArray<{
             entries?: {} | null | undefined;
@@ -2470,21 +2491,6 @@ export declare function initProjectModel(connection: mongoose.Connection): mongo
         id?: string | null | undefined;
         name?: string | null | undefined;
     }>;
-    name: string;
-    members: mongoose.Types.DocumentArray<{
-        userId: mongoose.Types.ObjectId;
-        role: "viewer" | "editor" | "admin";
-        archived: boolean;
-    }, mongoose.Types.Subdocument<mongoose.Types.ObjectId, any, {
-        userId: mongoose.Types.ObjectId;
-        role: "viewer" | "editor" | "admin";
-        archived: boolean;
-    }> & {
-        userId: mongoose.Types.ObjectId;
-        role: "viewer" | "editor" | "admin";
-        archived: boolean;
-    }>;
-    exports: mongoose.Types.ObjectId[];
     allowUpload: boolean;
     allowSharing: boolean;
     image?: string | null | undefined;

package/dist/db/initProjectModel.js

@@ -17,6 +17,7 @@ function initProjectModel(connection) {
         archived: { type: Boolean, default: false }
     }, { _id: false });
     const projectSchema = new mongoose_1.default.Schema({
+        dbType: { type: String, required: true },
         name: { type: String, required: true },
         description: { type: String },
         image: { type: String },

package/dist/db/initUserModel.d.ts

@@ -11,7 +11,7 @@ export declare function initUserModel(connection: mongoose.Connection): mongoose
 } & {
     username: string;
     email: string;
-}> & {
+}, {}> & {
     createdAt: NativeDate;
     updatedAt: NativeDate;
 } & {
@@ -35,7 +35,7 @@ export declare function initUserModel(connection: mongoose.Connection): mongoose
 } & {
     username: string;
     email: string;
-}>> & mongoose.FlatRecord<{
+}>, {}> & mongoose.FlatRecord<{
     createdAt: NativeDate;
     updatedAt: NativeDate;
 } & {

package/dist/middleware/createRouter.js

@@ -15,11 +15,27 @@ function isProjectMember(project, userId) {
 function createStreamByRouter(config) {
     const router = express_1.default.Router();
     const adapter = config.adapter || (0, createStorageProvider_1.createStorageProvider)(config.storageProviders);
-    const dbResult = config.projectProvider
-        ? { projectProvider: config.projectProvider, exportProvider: config.exportProvider, mongoConnection: undefined }
-        : (0, createDatabaseProvider_1.createDatabaseProvider)(config.databases, adapter);
-    const projectProvider = dbResult.projectProvider;
-    const exportProvider = dbResult.exportProvider;
+    const projectProviders = {};
+    let exportProvider;
+    let exportCollectionProvider;
+    if (config.databases) {
+        const db = (0, createDatabaseProvider_1.createDatabaseProvider)(config.databases, adapter);
+        projectProviders.nosql = db.projectProviders.nosql;
+        projectProviders.sql = db.projectProviders.sql;
+        exportProvider = db.exportProvider;
+        exportCollectionProvider = db.exportCollectionProvider;
+    }
+    else {
+        projectProviders.default = config.projectProvider;
+        exportProvider = config.exportProvider;
+        exportCollectionProvider = config.exportCollectionProvider;
+    }
+    if (!projectProviders.nosql && !projectProviders.sql) {
+        throw new Error('Project provider is not initialized. Please check your database configuration.');
+    }
+    if (!exportProvider) {
+        throw new Error('Export provider is not initialized. Please check your database configuration.');
+    }
     router.get('/auth', async (req, res) => {
         try {
             const auth = await config.authProvider(req);
@@ -29,6 +45,25 @@ function createStreamByRouter(config) {
             res.status(401).json({ logged: false });
         }
     });
+    router.get('/databases', async (req, res) => {
+        try {
+            const auth = await config.authProvider(req);
+            if (!auth) {
+                return res.status(401).json({ error: 'Unauthorized' });
+            }
+            const databases = [];
+            if (projectProviders.nosql) {
+                databases.push({ name: "NoSQL (Mongo)", value: "nosql" });
+            }
+            if (projectProviders.sql) {
+                databases.push({ name: "SQL (Prisma)", value: "sql" });
+            }
+            res.status(200).json({ databases });
+        }
+        catch (err) {
+            res.status(500).json({ error: 'Failed to get databases' });
+        }
+    });
     router.get('/upload-project-image-url/:id', async (req, res) => {
         try {
             const auth = await config.authProvider(req);
@@ -57,7 +92,11 @@ function createStreamByRouter(config) {
                 return res.status(400).json({ error: 'Missing projectId' });
             }
             await (0, file_1.deleteProjectImage)(adapter, projectId);
-            const updated = await projectProvider.update(projectId, { image: '' });
+            const provider = await getProjectProvider(projectId);
+            if (!provider) {
+                return res.status(404).json({ error: 'Project not found' });
+            }
+            const updated = await provider.update(projectId, { image: '' });
             res.status(201).json(updated);
         }
         catch (err) {
@@ -78,10 +117,51 @@ function createStreamByRouter(config) {
             res.status(500).json({ error: 'Failed to list files', details: err });
         }
     });
+    async function getProjectProvider(projectId, dbType) {
+        if (dbType) {
+            const specificProvider = projectProviders[dbType];
+            if (specificProvider) {
+                try {
+                    const project = await specificProvider.getById(projectId, true);
+                    if (project)
+                        return specificProvider;
+                }
+                catch (error) { /* ignore */ }
+            }
+            return null; // If dbType was provided and no project found in that specific provider, return null.
+        }
+        // If dbType is not provided, search both nosql and sql
+        if (projectProviders.nosql) {
+            try {
+                const project = await projectProviders.nosql.getById(projectId, true);
+                if (project)
+                    return projectProviders.nosql;
+            }
+            catch (error) { /* ignore */ }
+        }
+        if (projectProviders.sql) {
+            try {
+                const project = await projectProviders.sql.getById(projectId, true);
+                if (project)
+                    return projectProviders.sql;
+            }
+            catch (error) { /* ignore */ }
+        }
+        return null; // If not found in either nosql or sql, return null.
+    }
     router.get('/projects', async (req, res) => {
         try {
             const auth = await config.authProvider(req);
-            const projects = await projectProvider.list(auth.userId);
+            const projects = [];
+            if (projectProviders.nosql) {
+                projects.push(...await projectProviders.nosql.list(auth.userId));
+            }
+            if (projectProviders.sql) {
+                projects.push(...await projectProviders.sql.list(auth.userId));
+            }
+            if (projectProviders.default) {
+                projects.push(...await projectProviders.default.list(auth.userId));
+            }
             res.json({ projects });
         }
         catch (err) {
@@ -94,8 +174,13 @@ function createStreamByRouter(config) {
             if (auth.role !== 'admin' && auth.role !== 'editor') {
                 return res.status(403).json({ error: 'Permission denied' });
             }
-            const { name, description } = req.body;
-            const newProject = await projectProvider.create({
+            const { name, description, dbType } = req.body;
+            const provider = dbType ? projectProviders[dbType] : projectProviders.default || projectProviders.nosql || projectProviders.sql;
+            if (!provider) {
+                return res.status(400).json({ error: 'Invalid dbType' });
+            }
+            const newProject = await provider.create({
+                dbType: dbType || 'nosql',
                 name,
                 description: description || '',
                 members: [{ userId: auth.userId, role: "admin" }]
@@ -110,7 +195,12 @@ function createStreamByRouter(config) {
         try {
             const auth = await config.authProvider(req);
             const projectId = req.params.id;
-            const project = await projectProvider.getById(projectId);
+            const dbType = req.query.dbType;
+            const projectProvider = await getProjectProvider(projectId, dbType);
+            if (!projectProvider) {
+                return res.status(404).json({ error: 'Project not found' });
+            }
+            const project = await projectProvider.getById(projectId, true);
             if (!project) {
                 return res.status(404).json({ error: 'Project not found' });
             }
@@ -131,7 +221,11 @@ function createStreamByRouter(config) {
             }
             const projectId = req.params.id;
             const updates = req.body;
-            const project = await projectProvider.getById(projectId);
+            const projectProvider = await getProjectProvider(projectId);
+            if (!projectProvider) {
+                return res.status(404).json({ error: 'Project not found' });
+            }
+            const project = await projectProvider.getById(projectId, true);
             if (!project) {
                 return res.status(404).json({ error: 'Project not found' });
             }
@@ -152,7 +246,11 @@ function createStreamByRouter(config) {
         try {
             const auth = await config.authProvider(req);
             const projectId = req.params.id;
-            const project = await projectProvider.getById(projectId);
+            const projectProvider = await getProjectProvider(projectId);
+            if (!projectProvider) {
+                return res.status(404).json({ error: 'Project not found' });
+            }
+            const project = await projectProvider.getById(projectId, true);
             if (!project) {
                 return res.status(404).json({ error: 'Project not found' });
             }
@@ -170,7 +268,11 @@ function createStreamByRouter(config) {
         try {
             const auth = await config.authProvider(req);
             const projectId = req.params.id;
-            const project = await projectProvider.getById(projectId);
+            const projectProvider = await getProjectProvider(projectId);
+            if (!projectProvider) {
+                return res.status(404).json({ error: 'Project not found' });
+            }
+            const project = await projectProvider.getById(projectId, true);
             if (!project || !isProjectMember(project, auth.userId)) {
                 return res.status(403).json({ error: 'Unauthorized project access' });
             }
@@ -185,7 +287,11 @@ function createStreamByRouter(config) {
         try {
             const auth = await config.authProvider(req);
             const projectId = req.params.id;
-            const project = await projectProvider.getById(projectId);
+            const projectProvider = await getProjectProvider(projectId);
+            if (!projectProvider) {
+                return res.status(404).json({ error: 'Project not found' });
+            }
+            const project = await projectProvider.getById(projectId, true);
             if (!project || !isProjectMember(project, auth.userId)) {
                 return res.status(403).json({ error: 'Unauthorized project access' });
             }
@@ -201,7 +307,11 @@ function createStreamByRouter(config) {
             const auth = await config.authProvider(req);
             const projectId = req.params.id;
             const exportId = req.params.export_id;
-            const project = await projectProvider.getById(projectId);
+            const projectProvider = await getProjectProvider(projectId);
+            if (!projectProvider) {
+                return res.status(404).json({ error: 'Project not found' });
+            }
+            const project = await projectProvider.getById(projectId, true);
             if (!project) {
                 return res.status(404).json({ error: 'Project not found' });
             }
@@ -223,7 +333,11 @@ function createStreamByRouter(config) {
             if (!name || !collectionName) {
                 return res.status(400).json({ error: 'Missing export name or collectionName' });
             }
-            const project = await projectProvider.getById(projectId);
+            const projectProvider = await getProjectProvider(projectId);
+            if (!projectProvider) {
+                return res.status(404).json({ error: 'Project not found' });
+            }
+            const project = await projectProvider.getById(projectId, true);
             if (!project || !isProjectMember(project, auth.userId)) {
                 return res.status(403).json({ error: 'Unauthorized project access' });
             }
@@ -244,6 +358,10 @@ function createStreamByRouter(config) {
         try {
             const auth = await config.authProvider(req);
             const projectId = req.params.id;
+            const projectProvider = await getProjectProvider(projectId);
+            if (!projectProvider) {
+                return res.status(404).json({ error: 'Project not found' });
+            }
             const project = await projectProvider.getById(projectId, true);
             if (!project) {
                 return res.status(404).json({ error: 'Project not found' });

package/dist/models/ExportCollection.d.ts

@@ -13,7 +13,7 @@ export declare function initExportCollectionModel(connection: mongoose.Connectio
     name: string;
     entries: mongoose.Types.DocumentArray<{}, mongoose.Types.Subdocument<unknown, any, {}>>;
     projectId: mongoose.Types.ObjectId;
-}> & {
+}, {}> & {
     createdAt: NativeDate;
     updatedAt: NativeDate;
 } & {
@@ -40,7 +40,7 @@ export declare function initExportCollectionModel(connection: mongoose.Connectio
     name: string;
     entries: mongoose.Types.DocumentArray<{}, mongoose.Types.Subdocument<unknown, any, {}>>;
     projectId: mongoose.Types.ObjectId;
-}>> & mongoose.FlatRecord<{
+}>, {}> & mongoose.FlatRecord<{
     createdAt: NativeDate;
     updatedAt: NativeDate;
 } & {

package/dist/mongoose_models/initExportModel.d.ts

@@ -0,0 +1,61 @@
+import mongoose from 'mongoose';
+export declare function initExportModel(connection: mongoose.Connection): mongoose.Model<{
+    createdAt: NativeDate;
+    updatedAt: NativeDate;
+} & {
+    name: string;
+    collectionName: string;
+    projectId: mongoose.Types.ObjectId;
+    description?: string | null | undefined;
+}, {}, {}, {}, mongoose.Document<unknown, {}, {
+    createdAt: NativeDate;
+    updatedAt: NativeDate;
+} & {
+    name: string;
+    collectionName: string;
+    projectId: mongoose.Types.ObjectId;
+    description?: string | null | undefined;
+}, {}> & {
+    createdAt: NativeDate;
+    updatedAt: NativeDate;
+} & {
+    name: string;
+    collectionName: string;
+    projectId: mongoose.Types.ObjectId;
+    description?: string | null | undefined;
+} & {
+    _id: mongoose.Types.ObjectId;
+} & {
+    __v: number;
+}, mongoose.Schema<any, mongoose.Model<any, any, any, any, any, any>, {}, {}, {}, {}, {
+    timestamps: true;
+    collection: string;
+}, {
+    createdAt: NativeDate;
+    updatedAt: NativeDate;
+} & {
+    name: string;
+    collectionName: string;
+    projectId: mongoose.Types.ObjectId;
+    description?: string | null | undefined;
+}, mongoose.Document<unknown, {}, mongoose.FlatRecord<{
+    createdAt: NativeDate;
+    updatedAt: NativeDate;
+} & {
+    name: string;
+    collectionName: string;
+    projectId: mongoose.Types.ObjectId;
+    description?: string | null | undefined;
+}>, {}> & mongoose.FlatRecord<{
+    createdAt: NativeDate;
+    updatedAt: NativeDate;
+} & {
+    name: string;
+    collectionName: string;
+    projectId: mongoose.Types.ObjectId;
+    description?: string | null | undefined;
+}> & {
+    _id: mongoose.Types.ObjectId;
+} & {
+    __v: number;
+}>>;

package/dist/mongoose_models/initExportModel.js

@@ -0,0 +1,19 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.initExportModel = initExportModel;
+const mongoose_1 = __importDefault(require("mongoose"));
+function initExportModel(connection) {
+    const exportSchema = new mongoose_1.default.Schema({
+        name: { type: String, required: true },
+        description: { type: String },
+        collectionName: { type: String, required: true },
+        projectId: { type: mongoose_1.default.Schema.Types.ObjectId, ref: 'Project', required: true },
+    }, {
+        timestamps: true,
+        collection: 'streamby_exports'
+    });
+    return connection.model('Export', exportSchema);
+}