Skip to content

Commit 249c70c

Browse files
tegefaulkestegefaulkes
committed
fix: fixing up polykey dependency
1 parent a42ff4c commit 249c70c

110 files changed

Lines changed: 3177 additions & 995 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎package-lock.json‎

Lines changed: 2625 additions & 425 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,13 +66,13 @@
6666
"lintfix": "eslint '{src,tests,scripts}/**/*.{js,ts}' --fix",
6767
"lint-shell": "find ./src ./tests ./scripts -type f -regextype posix-extended -regex '.*\\.(sh)' -exec shellcheck {} +",
6868
"docs": "shx rm -rf ./docs && typedoc --gitRevision master --tsconfig ./tsconfig.build.json --out ./docs src",
69-
"pkg": "node ./scripts/pkg.js --no-dict=leveldown.js",
69+
"pkg": "node ./scripts/pkg.js",
7070
"polykey": "ts-node src/polykey.ts",
7171
"start": "ts-node src/polykey.ts -- agent start --verbose",
7272
"dev": "nodemon src/polykey.ts -- agent start --verbose"
7373
},
7474
"dependencies": {
75-
"@matrixai/polykey": "/home/faulkes/matixWorkspace/gitRepos/Polykey",
75+
"polykey": "^1.1.1",
7676
"@matrixai/logger": "^3.1.0",
7777
"@matrixai/errors": "^1.1.7",
7878
"@matrixai/quic": "^0.0.12",

‎release.nix‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ let
1414
buildPhase = ''
1515
npm run pkg -- \
1616
--output=out \
17-
--bin=typescript-demo-lib \
17+
--bin=polykey-cli \
1818
--node-version=${utils.nodeVersion} \
1919
--platform=linux \
2020
--arch=${arch}
@@ -35,7 +35,7 @@ let
3535
buildPhase = ''
3636
npm run pkg -- \
3737
--output=out.exe \
38-
--bin=typescript-demo-lib \
38+
--bin=polykey-cli \
3939
--node-version=${utils.nodeVersion} \
4040
--platform=win32 \
4141
--arch=${arch}
@@ -56,7 +56,7 @@ let
5656
buildPhase = ''
5757
npm run pkg -- \
5858
--output=out \
59-
--bin=typescript-demo-lib \
59+
--bin=polykey-cli \
6060
--node-version=${utils.nodeVersion} \
6161
--platform=darwin \
6262
--arch=${arch}
@@ -80,7 +80,7 @@ in
8080
mkdir -m 1777 tmp
8181
'';
8282
config = {
83-
Cmd = [ "/bin/typescript-demo-lib" ];
83+
Entrypoint = "/polykey-cli";
8484
};
8585
};
8686
package = {

‎src/CommandPolykey.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import type { FileSystem } from '@matrixai/polykey/dist/types';
1+
import type { FileSystem } from 'polykey/dist/types';
22
import commander from 'commander';
33
import Logger, {
44
StreamHandler,

‎src/agent/CommandLock.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import path from 'path';
2-
import config from '@matrixai/polykey/dist/config';
2+
import config from 'polykey/dist/config';
33
import CommandPolykey from '../CommandPolykey';
44

55
class CommandLock extends CommandPolykey {
@@ -9,7 +9,7 @@ class CommandLock extends CommandPolykey {
99
this.description('Lock the Client and Clear the Existing Token');
1010
this.action(async (options) => {
1111
const { default: Session } = await import(
12-
'@matrixai/polykey/dist/sessions/Session'
12+
'polykey/dist/sessions/Session'
1313
);
1414
const session = new Session({
1515
sessionTokenPath: path.join(

‎src/agent/CommandLockAll.ts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import type PolykeyClient from '@matrixai/polykey/dist/PolykeyClient';
2-
import type WebSocketClient from '@matrixai/polykey/dist/websockets/WebSocketClient';
1+
import type PolykeyClient from 'polykey/dist/PolykeyClient';
2+
import type WebSocketClient from 'polykey/dist/websockets/WebSocketClient';
33
import path from 'path';
4-
import config from '@matrixai/polykey/dist/config';
4+
import config from 'polykey/dist/config';
55
import CommandPolykey from '../CommandPolykey';
66
import * as binUtils from '../utils';
77
import * as binOptions from '../utils/options';
@@ -17,13 +17,13 @@ class CommandLockAll extends CommandPolykey {
1717
this.addOption(binOptions.clientPort);
1818
this.action(async (options) => {
1919
const { default: PolykeyClient } = await import(
20-
'@matrixai/polykey/dist/PolykeyClient'
20+
'polykey/dist/PolykeyClient'
2121
);
2222
const { default: WebSocketClient } = await import(
23-
'@matrixai/polykey/dist/websockets/WebSocketClient'
23+
'polykey/dist/websockets/WebSocketClient'
2424
);
2525
const { default: Session } = await import(
26-
'@matrixai/polykey/dist/sessions/Session'
26+
'polykey/dist/sessions/Session'
2727
);
2828
const clientOptions = await binProcessors.processClientOptions(
2929
options.nodePath,

‎src/agent/CommandStart.ts‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ import type {
44
AgentChildProcessInput,
55
AgentChildProcessOutput,
66
} from '../types';
7-
import type PolykeyAgent from '@matrixai/polykey/dist/PolykeyAgent';
8-
import type { RecoveryCode } from '@matrixai/polykey/dist/keys/types';
7+
import type PolykeyAgent from 'polykey/dist/PolykeyAgent';
8+
import type { RecoveryCode } from 'polykey/dist/keys/types';
99
import path from 'path';
1010
import childProcess from 'child_process';
1111
import process from 'process';
12-
import * as keysErrors from '@matrixai/polykey/dist/keys/errors';
13-
import { promise, dirEmpty } from '@matrixai/polykey/dist/utils';
14-
import config from '@matrixai/polykey/dist/config';
12+
import * as keysErrors from 'polykey/dist/keys/errors';
13+
import { promise, dirEmpty } from 'polykey/dist/utils';
14+
import config from 'polykey/dist/config';
1515
import CommandPolykey from '../CommandPolykey';
1616
import * as binUtils from '../utils';
1717
import * as binOptions from '../utils/options';
@@ -45,10 +45,10 @@ class CommandStart extends CommandPolykey {
4545
options.clientPort =
4646
options.clientPort ?? config.defaults.networkConfig.clientPort;
4747
const { default: PolykeyAgent } = await import(
48-
'@matrixai/polykey/dist/PolykeyAgent'
48+
'polykey/dist/PolykeyAgent'
4949
);
50-
const nodesUtils = await import('@matrixai/polykey/dist/nodes/utils');
51-
const keysUtils = await import('@matrixai/polykey/dist/keys/utils');
50+
const nodesUtils = await import('polykey/dist/nodes/utils');
51+
const keysUtils = await import('polykey/dist/keys/utils');
5252
let password: string | undefined;
5353
if (options.fresh) {
5454
// If fresh, then get a new password

‎src/agent/CommandStatus.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import type PolykeyClient from '@matrixai/polykey/dist/PolykeyClient';
2-
import type WebSocketClient from '@matrixai/polykey/dist/websockets/WebSocketClient';
3-
import type { StatusResultMessage } from '@matrixai/polykey/dist/client/handlers/types';
1+
import type PolykeyClient from 'polykey/dist/PolykeyClient';
2+
import type WebSocketClient from 'polykey/dist/websockets/WebSocketClient';
3+
import type { StatusResultMessage } from 'polykey/dist/client/handlers/types';
44
import CommandPolykey from '../CommandPolykey';
55
import * as binUtils from '../utils';
66
import * as binOptions from '../utils/options';
@@ -16,10 +16,10 @@ class CommandStatus extends CommandPolykey {
1616
this.addOption(binOptions.clientPort);
1717
this.action(async (options) => {
1818
const { default: PolykeyClient } = await import(
19-
'@matrixai/polykey/dist/PolykeyClient'
19+
'polykey/dist/PolykeyClient'
2020
);
2121
const { default: WebSocketClient } = await import(
22-
'@matrixai/polykey/dist/websockets/WebSocketClient'
22+
'polykey/dist/websockets/WebSocketClient'
2323
);
2424
const clientStatus = await binProcessors.processClientStatus(
2525
options.nodePath,

‎src/agent/CommandStop.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import type PolykeyClient from '@matrixai/polykey/dist/PolykeyClient';
2-
import type WebSocketClient from '@matrixai/polykey/dist/websockets/WebSocketClient';
1+
import type PolykeyClient from 'polykey/dist/PolykeyClient';
2+
import type WebSocketClient from 'polykey/dist/websockets/WebSocketClient';
33
import CommandPolykey from '../CommandPolykey';
44
import * as binUtils from '../utils';
55
import * as binOptions from '../utils/options';
@@ -16,10 +16,10 @@ class CommandStop extends CommandPolykey {
1616
this.addOption(binOptions.clientPort);
1717
this.action(async (options) => {
1818
const { default: PolykeyClient } = await import(
19-
'@matrixai/polykey/dist/PolykeyClient'
19+
'polykey/dist/PolykeyClient'
2020
);
2121
const { default: WebSocketClient } = await import(
22-
'@matrixai/polykey/dist/websockets/WebSocketClient'
22+
'polykey/dist/websockets/WebSocketClient'
2323
);
2424
const clientStatus = await binProcessors.processClientStatus(
2525
options.nodePath,

‎src/agent/CommandUnlock.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import type PolykeyClient from '@matrixai/polykey/dist/PolykeyClient';
2-
import type WebSocketClient from '@matrixai/polykey/dist/websockets/WebSocketClient';
1+
import type PolykeyClient from 'polykey/dist/PolykeyClient';
2+
import type WebSocketClient from 'polykey/dist/websockets/WebSocketClient';
33
import CommandPolykey from '../CommandPolykey';
44
import * as binUtils from '../utils';
55
import * as binOptions from '../utils/options';
@@ -15,10 +15,10 @@ class CommandUnlock extends CommandPolykey {
1515
this.addOption(binOptions.clientPort);
1616
this.action(async (options) => {
1717
const { default: PolykeyClient } = await import(
18-
'@matrixai/polykey/dist/PolykeyClient'
18+
'polykey/dist/PolykeyClient'
1919
);
2020
const { default: WebSocketClient } = await import(
21-
'@matrixai/polykey/dist/websockets/WebSocketClient'
21+
'polykey/dist/websockets/WebSocketClient'
2222
);
2323
const clientOptions = await binProcessors.processClientOptions(
2424
options.nodePath,

0 commit comments

Comments
 (0)