feature: server: pack: get rid of mock-require

Author: coderaiser

server/listen.js

@@ -59,10 +59,9 @@ function connection(rootRaw, socket, overrides) {
             socket.emit(`${id()}started`);
 
             const operation = getOperation(name, overrides);
-            
             const root = getValue(rootRaw);
 
-            operation(id(), root, socket, from, to, files);
+            operation(id(), root, socket, from, to, files, overrides);
         });
     });
 }

server/pack.js

@@ -1,32 +1,34 @@
 'use strict';
 
 const currify = require('currify');
-const onezip = require('onezip');
+const {onezip} = require('onezip');
 const jaguar = require('jaguar');
 const {webToWin} = require('mellow');
 
 const isRootWin32 = currify(require('./is-root-win32'));
 const WIN32_ROOT_MSG = 'Could not pack from/to root on windows!';
 
-module.exports = (type, id, root, socket, from, to, files) => {
+module.exports = (type, id, root, socket, from, to, files, overrides) => {
     from = webToWin(from, root);
     to = webToWin(to, root);
 
     if (![from, to].some(isRootWin32(root)))
-        return operate(type, id, socket, from, to, files);
+        return operate(type, id, socket, from, to, files, overrides);
 
     socket.emit(`${id}#error`, WIN32_ROOT_MSG);
 };
 
-function getOperation(type) {
+function getOperation(type, overrides = {}) {
+    const {pack} = overrides;
+    
     if (type === 'tar')
-        return jaguar.pack;
+        return (pack || jaguar.pack);
 
-    return onezip.pack;
+    return (pack || onezip.pack);
 }
 
-function operate(type, id, socket, from, to, files) {
-    const operate = getOperation(type);
+function operate(type, id, socket, from, to, files, overrides) {
+    const operate = getOperation(type, overrides);
     const operator = operate(from, to, files);
 
     operator.on('file', (name) => {

test/server/zip.js

@@ -3,37 +3,28 @@
 const {once} = require('node:events');
 
 const {test} = require('supertape');
-const mock = require('mock-require');
-const clear = require('clear-module');
 const wait = require('@iocmd/wait');
 
-const clearFileop = require('../lib/clear');
-
 const {
     endEmitter,
     errorEmitter,
     progressEmitter,
     fileEmitter,
 } = require('../lib/emitters');
 
+const connect = require('../lib/connect');
 const connectPath = '../lib/connect';
-const zipPath = 'onezip';
 
 test('operate: zip: error', async (t) => {
-    clearFileop();
-    clear(zipPath);
-    
     const from = '/hello';
     const to = '/world';
     const names = ['abc'];
 
-    mock(zipPath, {
-        pack: errorEmitter,
-    });
-    
     const connect = require(connectPath);
 
-    const {socket, done} = await connect();
+    const {socket, done} = await connect({
+        pack: errorEmitter,
+    });
 
     socket.emit('operation', 'zip', from, to, names);
     const [id] = await once(socket, 'id');
@@ -50,21 +41,14 @@ test('operate: zip: error', async (t) => {
 });
 
 test('operate: zip: progress', async (t) => {
-    clearFileop();
-    clear(zipPath);
-    
     const from = '/hello';
     const to = '/world';
     const names = ['abc'];
 
-    mock(zipPath, {
+    const {socket, done} = await connect({
         pack: progressEmitter,
     });
 
-    const connect = require(connectPath);
-    
-    const {socket, done} = await connect();
-    
     socket.emit('operation', 'zip', from, to, names);
     const [id] = await once(socket, 'id');
 
@@ -78,21 +62,14 @@ test('operate: zip: progress', async (t) => {
 });
 
 test('operate: zip: file', async (t) => {
-    clearFileop();
-    clear(zipPath);
-    
     const from = '/hello';
     const to = '/world';
     const names = ['abc'];
 
-    mock(zipPath, {
+    const {socket, done} = await connect({
         pack: fileEmitter,
     });
 
-    const connect = require(connectPath);
-    
-    const {socket, done} = await connect();
-    
     socket.emit('operation', 'zip', from, to, names);
     const [id] = await once(socket, 'id');
 
@@ -106,21 +83,14 @@ test('operate: zip: file', async (t) => {
 });
 
 test('operate: zip: end', async (t) => {
-    clearFileop();
-    clear(zipPath);
-    
     const from = '/hello';
     const to = '/world';
     const names = ['abc'];
 
-    mock(zipPath, {
+    const {socket, done} = await connect({
         pack: endEmitter,
     });
 
-    const connect = require(connectPath);
-    
-    const {socket, done} = await connect();
-    
     socket.emit('operation', 'zip', from, to, names);
     const [id] = await once(socket, 'id');
 
@@ -134,21 +104,14 @@ test('operate: zip: end', async (t) => {
 });
 
 test('operate: zip: abort', async (t) => {
-    clearFileop();
-    clear(zipPath);
-    
     const from = '/hello';
     const to = '/world';
     const names = ['abc'];
 
-    mock(zipPath, {
+    const {socket, done} = await connect({
         pack: errorEmitter,
     });
 
-    const connect = require(connectPath);
-    
-    const {socket, done} = await connect();
-    
     socket.emit('operation', 'zip', from, to, names);
     const [id] = await once(socket, 'id');