mosquito-transport 1.7.0 → 1.7.2

package/TODO

@@ -12,4 +12,5 @@
 - minimize extraction data ✅
 - add `TIMESTAMP_OFFSET` ✅
 - add maxSimulatenousAuth
-- cross emailVerify
+- cross emailVerify
+- add revalidate and reverify method to auth-response

package/lib/index.d.ts

@@ -283,6 +283,7 @@ interface MSocketSnapshot {
         emitWithAck: Socket['emitWithAck'];
     });
     disconnect: Socket['disconnect'];
+    disconnected: boolean;
 }
 
 interface MSocketError {

package/lib/index.js

@@ -35,6 +35,7 @@ import { statusErrorCode, useDDOS, validateDDOS_Config } from "./helpers/ddos.js
 import mime from 'mime';
 import LimitTasks from "limit-task";
 import { cpus } from "os";
+import { deserialize } from "entity-serializer";
 
 const { box } = naclPkg;
 
@@ -602,8 +603,14 @@ const useMosquitoServer = (app, config) => {
                 },
                 disconnect: (...args) => {
                     socket.disconnect(...args);
-                }
+                },
+                disconnected: false
             };
+
+            socket.on('disconnect', () => {
+                clonedSocket.disconnected = true;
+            });
+            // TODO: disconnected
             onSocketSnapshot(clonedSocket);
         } catch (e) {
             onSocketError?.(Object.assign(simplifyCaughtError(e).simpleError, { socket }));
@@ -836,6 +843,8 @@ export default class MosquitoTransportServer {
                                 reqBody = JSON.parse(body);
                             } catch (_) { }
                         } else reqBody = body;
+                    } else if (req.headers['content-type'] === undefined && req.body) {
+                        reqBody = deserialize(req.body);
                     }
 
                     req.body = reqBody;
@@ -956,7 +965,7 @@ export default class MosquitoTransportServer {
     deleteFile = async (path = '') => {
         if (Validator.LINK(path)) {
             const url = new URL(path);
-            if (url.pathname.startsWith(`${STORAGE_ROUTE}/`))
+            if (!url.pathname.startsWith(`${STORAGE_ROUTE}/`))
                 throw `link must have a pathname that starts with ${STORAGE_ROUTE}/`;
             path = url.pathname.substring(STORAGE_ROUTE.length);
         }

package/lib/products/database/base.js

@@ -6,16 +6,19 @@ import { Scoped } from "../../helpers/variables.js";
  */
 export const getDB = (projectName, name, url = DEFAULT_DB) => {
     if (!projectName) throw 'expected projectName in getDb()';
-    if (url === 'admin' || url === 'default') throw `reserved keyword dbRef: "${url}"`;
-
-    const dbUrl = url === ADMIN_DB_URL ? 'admin' : url === DEFAULT_DB ? 'default' : url;
-    const { defaultName: dbName, instance } = getDbInstance(projectName, dbUrl) || {};
+    const { defaultName: dbName, instance } = getDbInstance(projectName, url) || {};
 
     if (name === ADMIN_DB_NAME) name = dbName;
-    if (!instance) throw `no MongoClient was found for database with dbRef "${dbUrl}"`;
+    if (!instance) throw `no MongoClient was found for database with dbRef "${url}"`;
     // if (!name && !dbName) throw `no dbName found for database with dbRef "${dbUrl}"`;
 
     return instance.db(name || dbName);
 };
 
-export const getDbInstance = (projectName, dbUrl) => Scoped.InstancesData[projectName].mongoInstances[dbUrl];
+export const getDbInstance = (projectName, dbUrl = DEFAULT_DB) => {
+    if (!projectName) throw 'expected projectName in getDb()';
+    if (dbUrl === 'admin' || dbUrl === 'default') throw `reserved keyword dbRef: "${dbUrl}"`;
+
+    dbUrl = dbUrl === ADMIN_DB_URL ? 'admin' : dbUrl === DEFAULT_DB ? 'default' : dbUrl;
+    return Scoped.InstancesData[projectName].mongoInstances[dbUrl];
+}

package/lib/products/database/index.js

@@ -87,7 +87,7 @@ const cleanseFind = (path, find, projectName, dbName, dbUrl) => {
 
     if (instance.__intercepted) {
         const d = instance.interceptMap?.map?.[dbName]?.[path];
-        if (d.fulltext) return find;
+        if (d?.fulltext) return find;
     }
     return cleanseFindCore(find);
 }
@@ -124,21 +124,24 @@ const RawValueInstructions = {
     promoteValues: false
 };
 
-export const readDocument = async (commands, projectName, dbName, dbUrl) => {
+export const readDocument = (commands, projectName, dbName, dbUrl) => {
     const { path, find, returnRawValue } = commands;
-    const d = await getDB(projectName, dbName, dbUrl).collection(path || '')
+    return getDB(projectName, dbName, dbUrl).collection(path || '')
         .findOne(
             cleanseFind(path, { ...find }, projectName, dbName, dbUrl),
             returnRawValue ? RawValueInstructions : undefined
         );
+};
 
+export const readDocumentExtraction = async (commands, projectName, dbName, dbUrl) => {
+    const d = await readDocument(commands, projectName, dbName, dbUrl);
     const doc_holder = {};
     const data = await extractDocField(d, commands, projectName, dbName, dbUrl, doc_holder);
 
     return { data, doc_holder };
 };
 
-export const queryDocument = async (commands, projectName, dbName, dbUrl) => {
+export const queryDocument = (commands, projectName, dbName, dbUrl) => {
     const { path, find, limit, sort, direction, random, returnRawValue } = commands;
     let d = getDB(projectName, dbName, dbUrl).collection(path);
     const findObj = cleanseFind(path, { ...find }, projectName, dbName, dbUrl);
@@ -157,7 +160,11 @@ export const queryDocument = async (commands, projectName, dbName, dbUrl) => {
         if (limit) d = d.limit(limit);
     }
 
-    d = await d.toArray();
+    return d.toArray();
+};
+
+export const queryDocumentExtraction = async (commands, projectName, dbName, dbUrl) => {
+    const d = await queryDocument(commands, projectName, dbName, dbUrl);
     const doc_holder = {};
     const data = await Promise.all(d.map(v => extractDocField(v, commands, projectName, dbName, dbUrl, doc_holder)));
 
@@ -487,7 +494,7 @@ export const databaseRoutes = ({ projectName, logger, enforceE2E_Encryption, cas
 
             switch (route) {
                 case _readDocument:
-                    const result = await readDocument({
+                    const result = await readDocumentExtraction({
                         ...commands,
                         returnRawValue: true
                     }, projectName, dbName, dbUrl);
@@ -495,7 +502,7 @@ export const databaseRoutes = ({ projectName, logger, enforceE2E_Encryption, cas
                     res.status(200).send(await makeResult({ status: 'success', result: serializeToBase64({ _: result }) }));
                     break;
                 case _queryCollection:
-                    const result1 = await queryDocument({
+                    const result1 = await queryDocumentExtraction({
                         ...commands,
                         returnRawValue: true
                     }, projectName, dbName, dbUrl);
@@ -631,7 +638,7 @@ export const databaseLiveRoutesHandler = ({
                 }
 
                 const callSnapshot = async () => {
-                    const a = await (isDocumentWatch ? readDocument : queryDocument)({
+                    const a = await (isDocumentWatch ? readDocumentExtraction : queryDocumentExtraction)({
                         ...commands,
                         returnRawValue: true
                     }, projectName, dbName, dbUrl);

package/lib/products/storage/store.js

@@ -69,9 +69,10 @@ export const streamWritableSource = (path, makeHash, projectName, callback) => {
                     await handler.close();
                 };
                 /** @type {import('fs').WriteStream} */
-                let fileWriter,
-                    bufferSize = 0,
-                    residueExecutions = [];
+                let fileWriter;
+                let bufferSize = 0;
+                let residueExecutions = [];
+                let resolvedData;
 
                 const hasher = createHash('sha256');
 
@@ -88,7 +89,7 @@ export const streamWritableSource = (path, makeHash, projectName, callback) => {
 
                 stream.on('error', async err => {
                     await writeReadyPromise;
-                    reject(err);
+                    fileWriter.destroy(new Error(err));
                     removeLogFlag(true);
                 });
 
@@ -144,10 +145,10 @@ export const streamWritableSource = (path, makeHash, projectName, callback) => {
                                                 await new Promise(async (resolve, reject) => {
                                                     const writer = createWriteStream(await ensureDir(join(FILES, path)));
                                                     writtenPath = writer.path;
+                                                    writer.on('finish', resolve).on('error', reject);
+
                                                     createReadStream(fileWriter.path)
-                                                        .pipe(writer)
-                                                        .on('finish', resolve)
-                                                        .on('error', reject);
+                                                        .pipe(writer);
                                                 });
                                                 break;
                                             }
@@ -164,7 +165,8 @@ export const streamWritableSource = (path, makeHash, projectName, callback) => {
                                 });
                             } else uri = hashPath;
                             await removeLogFlag(true);
-                            resolve(uri);
+                            resolvedData = uri;
+                            fileWriter.end();
                         } else {
                             try {
                                 await deleteSource(path, projectName);
@@ -172,11 +174,12 @@ export const streamWritableSource = (path, makeHash, projectName, callback) => {
                             await rename(fileWriter.path, hashPath);
                             await saveHash();
                             await removeLogFlag();
-                            resolve(hashPath);
+                            resolvedData = hashPath;
+                            fileWriter.end();
                         }
                     } catch (error) {
                         await removeLogFlag(true);
-                        reject(error);
+                        fileWriter.destroy(new Error(error));
                     }
                 });
                 await openIO(await ensureDir(PENDING_HASH_LOG)).then(async handler => {
@@ -186,25 +189,42 @@ export const streamWritableSource = (path, makeHash, projectName, callback) => {
                     await handler.close();
                 });
                 fileWriter = createWriteStream(await ensureDir(join(HASH_FILE, sessionID)));
+                fileWriter.on('finish', () => {
+                    resolve(resolvedData);
+                });
+                fileWriter.on('error', (err) => {
+                    reject(err);
+                });
                 residueExecutions.forEach(e => e());
                 residueExecutions = undefined;
                 writeReadyCallback();
             } else {
-                let writable, residueBuffers = [];
+                /** @type {import('fs').WriteStream} */
+                let writable;
+                let residueBuffers = [];
 
                 stream.on('data', buf => {
                     if (residueBuffers) residueBuffers.push(buf);
                     else writable.write(buf);
                 });
-                stream.on('error', reject);
+                stream.on('error', async (err) => {
+                    await writeReadyPromise;
+                    writable.destroy(err);
+                });
                 stream.on('end', async () => {
                     await writeReadyPromise;
                     try {
                         await deleteSource(path, projectName, 'hash');
                     } catch (_) { }
-                    resolve(writable.path);
+                    writable.end();
                 });
                 writable = createWriteStream(await ensureDir(join(FILES, path)));
+                writable.on('finish', () => {
+                    resolve(writable.path);
+                });
+                writable.on('error', (err) => {
+                    reject(err);
+                });
                 residueBuffers.forEach(buf => {
                     writable.write(buf);
                 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mosquito-transport",
-  "version": "1.7.0",
+  "version": "1.7.2",
   "description": "Quickly spawn server infrastructure along robust authentication, database, storage, and cross-platform compatibility",
   "main": "lib/index.js",
   "type": "module",
@@ -43,7 +43,7 @@
     "entity-serializer": "^1.0.2",
     "express": "^4.18.2",
     "google-auth-library": "^8.8.0",
-    "guard-object": "^1.1.3",
+    "guard-object": "^1.1.4",
     "jsonwebtoken": "^9.0.0",
     "limit-task": "1.0.0",
     "lodash": "^4.17.21",