Merge pull request #26 from SamKirkland/upgrade-dependencies

upgrade dependencies

Author: SamKirkland

@types/global.d.ts

@@ -0,0 +1,5 @@
+// eslint-disable-next-line @typescript-eslint/no-empty-interface
+export interface global { }
+declare global {
+    function reconnect(): Promise<void>;
+}

@types/vendor.d.ts

@@ -74,3 +74,4 @@ To list all commands with examples simply run `ftp-deploy` without any options.
 | `--exclude`               | No       | `nuclearLaunchCodes.txt`   | `**/.git*` `**/.git*/**` `**/node_modules/**` | An array of glob patterns, these files will not be included in the publish/delete process                                                                          |
 | `--log-level`             | No       | `info`                     | `info`                                        | `minimal`: only important info, `standard`: important info and basic file changes, `verbose`: print everything the script is doing                                 |
 | `--security`              | No       | `strict`                   | `loose`                                       | `strict`: Reject any connection which is not authorized with the list of supplied CAs. `loose`: Allow connection even when the domain is not in certificate        |
+| `--timeout`               | No       | `60000`                    | `30000`                                       | Timeout in milliseconds for FTP operations                                                                                                                         |

README.md

@@ -26,31 +26,31 @@
   "author": "Sam Kirkland",
   "license": "MIT",
   "dependencies": {
-    "basic-ftp": "^4.6.6",
+    "basic-ftp": "^5.0.1",
     "lodash": "^4.17.21",
     "multimatch": "^5.0.0",
-    "np": "^7.5.0",
+    "np": "^7.6.2",
     "pretty-bytes": "^5.6.0",
     "pretty-ms": "^7.0.1",
     "readdir-enhanced": "^6.0.4",
-    "yargs": "^17.2.1"
+    "yargs": "^17.5.1"
   },
   "devDependencies": {
-    "@types/jest": "^27.0.2",
-    "@types/lodash": "^4.14.170",
+    "@types/jest": "^28.1.7",
+    "@types/lodash": "^4.14.184",
     "@types/minimatch": "^3.0.4",
-    "@types/node": "^14.17.3",
-    "@types/yargs": "^17.0.3",
-    "@typescript-eslint/eslint-plugin": "^4.28.0",
-    "@typescript-eslint/parser": "^4.28.0",
-    "eslint": "^7.29.0",
-    "eslint-plugin-jest": "^24.0.0",
-    "ftp-srv": "^4.5.0",
-    "jest": "^27.2.5",
-    "js-yaml": "^3.14.0",
-    "ts-jest": "^27.0.5",
-    "ts-node-dev": "^1.1.8",
-    "typescript": "^4.3.4"
+    "@types/node": "^18.7.9",
+    "@types/yargs": "^17.0.11",
+    "@typescript-eslint/eslint-plugin": "^5.33.1",
+    "@typescript-eslint/parser": "^5.33.1",
+    "eslint": "^8.22.0",
+    "eslint-plugin-jest": "^26.8.6",
+    "ftp-srv": "^4.6.2",
+    "jest": "^28.1.3",
+    "js-yaml": "^4.1.0",
+    "ts-jest": "^28.0.8",
+    "ts-node-dev": "^2.0.0",
+    "typescript": "^4.7.4"
   },
   "bugs": {
     "url": "https://github.com/SamKirkland/ftp-deploy/issues"

package-lock.json

@@ -66,17 +66,19 @@ async function connect(client: ftp.Client, args: IFtpDeployArgumentsWithDefaults
     }
 }
 
-async function getServerFiles(client: ftp.Client, logger: ILogger, timings: ITimings, args: IFtpDeployArgumentsWithDefaults): Promise<IFileList> {
+export async function getServerFiles(client: ftp.Client, logger: ILogger, timings: ITimings, args: IFtpDeployArgumentsWithDefaults): Promise<IFileList> {
     try {
         await ensureDir(client, logger, timings, args["server-dir"]);
 
         if (args["dangerous-clean-slate"]) {
             logger.all(`----------------------------------------------------------------`);
             logger.all("🗑️ Removing all files on the server because 'dangerous-clean-slate' was set, this will make the deployment very slow...");
-            await client.clearWorkingDir();
+            if (args["dry-run"] === false) {
+                await client.clearWorkingDir();
+            }
             logger.all("Clear complete");
 
-            throw new Error("nope");
+            throw new Error("dangerous-clean-slate was run");
         }
 
         const serverFiles = await downloadFileList(client, logger, args["state-name"]);

package.json

@@ -1,12 +1,12 @@
 import { HashDiff } from "./HashDiff";
-import { IFileList, currentSyncFileVersion, IFile, IFtpDeployArgumentsWithDefaults } from "./types";
+import { IFileList, currentSyncFileVersion, IFile, IFtpDeployArgumentsWithDefaults, DiffResult } from "./types";
 import { Record } from "./types";
 import { applyExcludeFilter, getDefaultSettings, ILogger, Timings } from "./utilities";
 import path from "path";
 import FtpSrv from "ftp-srv";
 import { getLocalFiles } from "./localFiles";
 import { FTPSyncProvider } from "./syncProvider";
-import { deploy } from "./deploy";
+import { deploy, getServerFiles } from "./deploy";
 import { Stats as readdirStats } from "@jsdevtools/readdir-enhanced";
 import { excludeDefaults } from "./module";
 
@@ -787,6 +787,91 @@ describe("error handling", () => {
     }, 30000);
 });
 
+describe("dry-run", () => {
+    test("getServerFiles doesn't mutate server", async () => {
+        const mockedLogger = new MockedLogger();
+        const mockedTimings = new Timings();
+        const mockClient = {
+            clearWorkingDir() { },
+            ensureDir() { },
+        };
+        const settings = getDefaultSettings({
+            server: "a",
+            username: "b",
+            password: "c",
+            "dry-run": true,
+            "dangerous-clean-slate": true,
+        });
+
+        const spyClearWorkingDir = jest.spyOn(mockClient, "clearWorkingDir");
+        await getServerFiles(mockClient as any, mockedLogger, mockedTimings, settings);
+
+        expect(spyClearWorkingDir).toHaveBeenCalledTimes(0);
+    });
+
+    test("doesn't mutate server", async () => {
+        const mockedLogger = new MockedLogger();
+        const mockedTimings = new Timings();
+        const mockClient = {
+            uploadFile() { },
+            removeFile() { },
+            uploadFrom() { },
+            remove() { },
+        };
+        const mockedDiffs: DiffResult = {
+            upload: [
+                {
+                    type: "file",
+                    name: "path/upload.txt",
+                    size: 1000,
+                    hash: "hash2",
+                }
+            ],
+            delete: [
+                {
+                    type: "file",
+                    name: "path/delete.txt",
+                    size: 1000,
+                    hash: "hash2",
+                }
+            ],
+            replace: [
+                {
+                    type: "file",
+                    name: "path/replace.txt",
+                    size: 1000,
+                    hash: "hash2",
+                }
+            ],
+            same: [
+                {
+                    type: "file",
+                    name: "path/same.txt",
+                    size: 1000,
+                    hash: "hash2",
+                }
+            ],
+            sizeUpload: 1000,
+            sizeDelete: 1000,
+            sizeReplace: 1000,
+        };
+
+        // todo ensureDir
+
+        const syncProvider = new FTPSyncProvider(mockClient as any, mockedLogger, mockedTimings, "local-dir/", "server-dir/", "state-name", true);
+        const spyUploadFile = jest.spyOn(mockClient, "uploadFile");
+        const spyRemoveFile = jest.spyOn(mockClient, "removeFile");
+        const spyUploadFrom = jest.spyOn(mockClient, "uploadFrom");
+        const spyRemove = jest.spyOn(mockClient, "remove");
+        await syncProvider.syncLocalToServer(mockedDiffs);
+
+        expect(spyUploadFile).toHaveBeenCalledTimes(0);
+        expect(spyRemoveFile).toHaveBeenCalledTimes(0);
+        expect(spyUploadFrom).toHaveBeenCalledTimes(0);
+        expect(spyRemove).toHaveBeenCalledTimes(0);
+    });
+});
+
 describe("Deploy", () => {
     const port = 2121;
     const homeDir = path.join(__dirname, "../");