wip: converting imports

Author: tegefaulkes

npmDepsHash

@@ -1 +1 @@
-sha256-LHQ8nB8ewWjKMgdkS1oguQKaFk1IsAroYdZ21Z7bnME=
+sha256-YnXZgZFFew+nEbpxAnslWboXViBWXyRmtJ6xwLDEosg=

package-lock.json

@@ -166,7 +166,7 @@
     "nexpect": "^0.6.0",
     "node-gyp-build": "^4.8.4",
     "nodemon": "^3.0.1",
-    "polykey": "^2.0.0",
+    "polykey": "^2.0.3",
     "prettier": "^3.0.0",
     "shelljs": "^0.8.5",
     "shx": "^0.3.4",

package.json

@@ -7,7 +7,7 @@ import url from 'node:url';
 import process from 'node:process';
 import childProcess from 'node:child_process';
 import esbuild from 'esbuild';
-import polykey from 'polykey';
+import config from 'polykey/config.js';
 import packageJSON from '../package.json' assert { type: 'json' };
 
 const projectPath = path.dirname(
@@ -52,10 +52,10 @@ async function main(argv = process.argv) {
     versionMetadata: {
       version: packageJSON.version,
       commitHash: gitHead,
-      libVersion: polykey.config.version,
-      libSourceVersion: polykey.config.sourceVersion,
-      libStateVersion: polykey.config.stateVersion.toString(),
-      libNetworkVersion: polykey.config.networkVersion.toString(),
+      libVersion: config.version,
+      libSourceVersion: config.sourceVersion,
+      libStateVersion: config.stateVersion.toString(),
+      libNetworkVersion: config.networkVersion.toString(),
     },
   };
   console.error('Writing build metadata (build.json):');

scripts/build.mjs

@@ -25,10 +25,10 @@ class CommandPolykey extends commander.Command {
 
   public constructor({
     exitHandlers,
-    fs = require('fs'),
+    fs,
   }: {
     exitHandlers: binUtils.ExitHandlers;
-    fs?: FileSystem;
+    fs: FileSystem;
   }) {
     super();
     this.fs = fs;

src/CommandPolykey.ts

@@ -16,6 +16,7 @@ import process from 'process';
  * If the worker manager is used, it must be stopped gracefully with the PolykeyAgent
  */
 import 'threads';
+import url from 'node:url';
 process.removeAllListeners('SIGINT');
 process.removeAllListeners('SIGTERM');
 
@@ -254,8 +255,11 @@ async function main(argv = process.argv): Promise<number> {
   }
 }
 
-if (require.main === module) {
-  void main();
+if (import.meta.url.startsWith('file:')) {
+  const modulePath = url.fileURLToPath(import.meta.url);
+  if (process.argv[1] === modulePath) {
+    void main();
+  }
 }
 
 export default main;

src/polykey.ts

@@ -21,7 +21,7 @@ class CommandList extends CommandPolykey {
     this.addOption(binOptions.clientPort);
     this.action(async (secretPath, options) => {
       const { default: PolykeyClient } = await import(
-        'polykey/dist/PolykeyClient'
+        'polykey/PolykeyClient.js'
       );
       const clientOptions = await binProcessors.processClientOptions(
         options.nodePath,

src/secrets/CommandList.ts

@@ -26,7 +26,7 @@ class CommandMkdir extends CommandPolykey {
         binParsers.parseSecretPath(path),
       );
       const { default: PolykeyClient } = await import(
-        'polykey/dist/PolykeyClient'
+        'polykey/PolykeyClient.js'
       );
       const clientOptions = await binProcessors.processClientOptions(
         options.nodePath,

src/secrets/CommandMkdir.ts

@@ -25,7 +25,7 @@ class CommandRemove extends CommandPolykey {
         binParsers.parseSecretPath(path),
       );
       const { default: PolykeyClient } = await import(
-        'polykey/dist/PolykeyClient'
+        'polykey/PolykeyClient.js'
       );
       const clientOptions = await binProcessors.processClientOptions(
         options.nodePath,

src/secrets/CommandRemove.ts

@@ -16,6 +16,7 @@ import Status from 'polykey/status/Status.js';
 import * as clientUtils from 'polykey/client/utils.js';
 import { arrayZip, promise } from 'polykey/utils/index.js';
 import config from 'polykey/config.js';
+import * as utils from './utils.js';
 import * as errors from '../errors.js';
 
 /**
@@ -175,9 +176,10 @@ async function processPassword(
  */
 async function processNewPassword(
   passwordNewFile?: string,
-  fs: FileSystem = require('fs'),
+  fs?: FileSystem,
   existing: boolean = false,
 ): Promise<string> {
+  fs = await utils.importFS(fs);
   let passwordNew: string | undefined;
   if (passwordNewFile != null) {
     try {
@@ -217,8 +219,9 @@ async function processNewPassword(
  */
 async function processRecoveryCode(
   recoveryCodeFile?: string,
-  fs: FileSystem = require('fs'),
+  fs?: FileSystem,
 ): Promise<RecoveryCode | undefined> {
+  fs = await utils.importFS(fs);
   let recoveryCode: string | undefined;
   if (recoveryCodeFile != null) {
     try {
@@ -258,13 +261,14 @@ async function processClientOptions(
   nodeId?: NodeId,
   clientHost?: string,
   clientPort?: number,
-  fs = require('fs'),
+  fs?: FileSystem,
   logger = new Logger(processClientOptions.name),
 ): Promise<{
   nodeId: NodeId;
   clientHost: string;
   clientPort: number;
 }> {
+  fs = await utils.importFS(fs);
   if (nodeId != null && clientHost != null && clientPort != null) {
     return {
       nodeId,
@@ -321,7 +325,7 @@ async function processClientStatus(
   nodeId?: NodeId,
   clientHost?: string,
   clientPort?: number,
-  fs = require('fs'),
+  fs?: FileSystem,
   logger = new Logger(processClientStatus.name),
 ): Promise<
   | {
@@ -346,6 +350,7 @@ async function processClientStatus(
       clientPort: number;
     }
 > {
+  fs = await utils.importFS(fs);
   if (nodeId != null && clientHost != null && clientPort != null) {
     return {
       statusInfo: undefined,
@@ -426,8 +431,9 @@ async function processClientStatus(
  */
 async function processAuthentication(
   passwordFile?: string,
-  fs: FileSystem = require('fs'),
+  fs?: FileSystem,
 ): Promise<{ authorization?: string }> {
+  fs = await utils.importFS(fs);
   if (passwordFile != null) {
     let password;
     try {