Switch back to regular JS

expandigroup · Oct 8, 2024 · 8468d97 · 8468d97
1 parent d30c8a6
commit 8468d97
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 16 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -9,10 +9,10 @@
       "request": "launch",
       "name": "Run proxy",
       "skipFiles": ["<node_internals>/**"],
-      "program": "${workspaceFolder}/index.mjs",
+      "program": "${workspaceFolder}/index.js",
       "args": ["-M", "-d", "/tmp/podman.sock"],
       "preLaunchTask": "Remove old socket",
-      "outFiles": ["${workspaceFolder}/**/*.js", "${workspaceFolder}/**/*.mjs"]
+      "outFiles": ["${workspaceFolder}/**/*.js", "${workspaceFolder}/**/*.js"]
     }
   ]
 }
diff --git a/index.mjs → index.js b/index.mjs → index.js
@@ -1,11 +1,11 @@
-import fs from 'fs';
-import http from 'http';
-import net from 'net';
-import path from 'path';
-import systemdSocket from 'systemd-socket';
-import url from 'url';
-import { execFileSync } from 'child_process';
-import { program } from 'commander';
+const fs = require('fs');
+const http = require('http');
+const net = require('net');
+const path = require('path');
+const systemdSocket = require('systemd-socket');
+const url = require('url');
+const { execFileSync } = require('child_process');
+const { program } = require('commander');
 
 const defaultUpstreamSocketPath = '/mnt/wsl/podman-sockets/podman-machine-default/podman-root.sock';
 const defaultDownstreamSocketPath = '/run/podman/podman.sock';
@@ -150,7 +150,9 @@ function translateHostPath(hostPath) {
         // noinspection ExceptionCaughtLocallyJS
         throw new Error(`PODMAN WSL SERVICE BUG: unexpected path format, expected absolute path: '${hostPath}'`);
       }
-      return path.join(sharedRoot, hostPath.slice(1));
+      const res = path.join(sharedRoot, hostPath.slice(1));
+      console.debug(`Translating host path: ${hostPath} -> ${res}`);
+      return res;
     }
     return winPath;
   } catch (err) {

diff --git a/package.json b/package.json
@@ -2,14 +2,14 @@
   "name": "podman-wsl-service",
   "version": "1.0.0",
   "description": "",
-  "main": "index.mjs",
+  "main": "index.js",
   "scripts": {
-    "start": "node --disable-warning=DEP0060 index.mjs",
-    "watch": "node --disable-warning=DEP0060 --watch index.mjs",
+    "start": "node --disable-warning=DEP0060 index.js",
+    "watch": "node --disable-warning=DEP0060 --watch index.js",
     "test": "echo \"Error: no test specified\" && exit 1",
     "pkg": "npm run pkg-x86_64 && npm run pkg-arm64",
-    "pkg-x86_64": "pkg -o dist/podman-wsl-service-x86_64 -t node22-linux-x64 --options \"disable-warning=DEP0060\" --public -C brotli -c package.json index.mjs",
-    "pkg-arm64": "pkg -o dist/podman-wsl-service-arm64 -t node22-linux-arm64 --options \"disable-warning=DEP0060\" --public -C brotli -c package.json index.mjs",
+    "pkg-x86_64": "pkg -o dist/podman-wsl-service-x86_64 -t node22-linux-x64 --options \"disable-warning=DEP0060\" --public -C brotli -c package.json index.js",
+    "pkg-arm64": "pkg -o dist/podman-wsl-service-arm64 -t node22-linux-arm64 --options \"disable-warning=DEP0060\" --public -C brotli -c package.json index.js",
     "clean": "rm -rf dist"
   },
   "private": true,