mosquito-transport 1.7.1 → 1.7.2

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

@@ -603,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 }));
@@ -959,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/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.1",
+  "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",