WIP

MatrixAI · Nov 1, 2021 · 6345e6c · 6345e6c
1 parent d32d8ee
commit 6345e6c
Show file tree

Hide file tree

Showing 30 changed files with 43 additions and 30 deletions.
diff --git a/src/bin/nodes/claim.ts b/src/bin/nodes/claim.ts
@@ -1,7 +1,7 @@
 import { errors } from '../../grpc';
 import Logger, { LogLevel, StreamHandler } from '@matrixai/logger';
 import { utils as clientUtils } from '../../client';
-import * as clientPB from '../../client/clientPB';
+import * as nodesPB from '../../proto/js/polykey/v1/nodes/nodes_pb';
 import PolykeyClient from '../../PolykeyClient';
 import { createCommand, outputFormatter } from '../utils';
 import * as utils from '../../utils';

diff --git a/src/bin/nodes/find.ts b/src/bin/nodes/find.ts
@@ -2,7 +2,7 @@ import type { Host, Port } from '../../network/types';
 import { errors } from '../../grpc';
 import Logger, { LogLevel, StreamHandler } from '@matrixai/logger';
 import { utils as clientUtils } from '../../client';
-import * as clientPB from '../../client/clientPB';
+import * as nodesPB from '../../proto/js/polykey/v1/nodes/nodes_pb';
 import PolykeyClient from '../../PolykeyClient';
 import { createCommand, outputFormatter } from '../utils';
 import { ErrorNodeGraphNodeNotFound } from '../../errors';

diff --git a/src/bin/nodes/ping.ts b/src/bin/nodes/ping.ts
@@ -1,7 +1,7 @@
 import { errors } from '../../grpc';
 import Logger, { LogLevel, StreamHandler } from '@matrixai/logger';
 import { utils as clientUtils } from '../../client';
-import * as clientPB from '../../client/clientPB';
+import * as nodesPB from '../../proto/js/polykey/v1/nodes/nodes_pb';
 import PolykeyClient from '../../PolykeyClient';
 import { createCommand, outputFormatter } from '../utils';
 import { ErrorNodeGraphNodeNotFound } from '../../errors';

diff --git a/src/bin/nodes/unclaim.ts b/src/bin/nodes/unclaim.ts
@@ -1,6 +1,6 @@
 import { errors } from '../../grpc';
 import Logger, { LogLevel, StreamHandler } from '@matrixai/logger';
-import * as clientPB from '../../client/clientPB';
+import * as utilsPB from '../../proto/js/polykey/v1/utils/utils_pb';
 import PolykeyClient from '../../PolykeyClient';
 import { createCommand, outputFormatter } from '../utils';
 

diff --git a/src/bin/notifications/clear.ts b/src/bin/notifications/clear.ts
@@ -2,7 +2,7 @@ import Logger, { LogLevel, StreamHandler } from '@matrixai/logger';
 import { createCommand, outputFormatter } from '../utils';
 import { errors } from '../../grpc';
 import { utils as clientUtils } from '../../client';
-import * as clientPB from '../../client/clientPB';
+import * as utilsPB from '../../proto/js/polykey/v1/utils/utils_pb';
 import PolykeyClient from '../../PolykeyClient';
 import * as utils from '../../utils';
 

diff --git a/src/bin/notifications/read.ts b/src/bin/notifications/read.ts
@@ -3,7 +3,7 @@ import Logger, { LogLevel, StreamHandler } from '@matrixai/logger';
 import { createCommand, outputFormatter } from '../utils';
 import { errors } from '../../grpc';
 import { utils as clientUtils } from '../../client';
-import * as clientPB from '../../client/clientPB';
+import * as notificationsPB from '../../proto/js/polykey/v1/notifications/notifications_pb';
 import PolykeyClient from '../../PolykeyClient';
 import * as utils from '../../utils';
 import * as notificationsUtils from '../../notifications/utils';

diff --git a/src/bin/notifications/send.ts b/src/bin/notifications/send.ts
@@ -2,7 +2,7 @@ import Logger, { LogLevel, StreamHandler } from '@matrixai/logger';
 import { createCommand, outputFormatter } from '../utils';
 import { errors } from '../../grpc';
 import { utils as clientUtils } from '../../client';
-import * as clientPB from '../../client/clientPB';
+import * as notificationsPB from '../../proto/js/polykey/v1/notifications/notifications_pb';
 import PolykeyClient from '../../PolykeyClient';
 import * as utils from '../../utils';
 

diff --git a/src/bin/secrets/create.ts b/src/bin/secrets/create.ts
@@ -1,7 +1,8 @@
 import fs from 'fs';
 import Logger, { LogLevel, StreamHandler } from '@matrixai/logger';
 import { utils as clientUtils } from '../../client';
-import * as clientPB from '../../client/clientPB';
+import * as vaultsPB from '../../proto/js/polykey/v1/vaults/vaults_pb';
+import * as secretsPB from '../../proto/js/polykey/v1/secrets/secrets_pb';
 import PolykeyClient from '../../PolykeyClient';
 import * as utils from '../../utils';
 import * as binUtils from '../utils';

diff --git a/src/bin/secrets/delete.ts b/src/bin/secrets/delete.ts
@@ -1,6 +1,7 @@
 import Logger, { LogLevel, StreamHandler } from '@matrixai/logger';
 import { utils as clientUtils } from '../../client';
-import * as clientPB from '../../client/clientPB';
+import * as vaultsPB from '../../proto/js/polykey/v1/vaults/vaults_pb';
+import * as secretsPB from '../../proto/js/polykey/v1/secrets/secrets_pb';
 import PolykeyClient from '../../PolykeyClient';
 import * as utils from '../../utils';
 import * as binUtils from '../utils';

diff --git a/src/bin/secrets/dir.ts b/src/bin/secrets/dir.ts
@@ -1,6 +1,7 @@
 import Logger, { LogLevel, StreamHandler } from '@matrixai/logger';
 import { utils as clientUtils } from '../../client';
-import * as clientPB from '../../client/clientPB';
+import * as vaultsPB from '../../proto/js/polykey/v1/vaults/vaults_pb';
+import * as secretsPB from '../../proto/js/polykey/v1/secrets/secrets_pb';
 import PolykeyClient from '../../PolykeyClient';
 import * as utils from '../../utils';
 import * as binUtils from '../utils';

diff --git a/src/bin/secrets/edit.ts b/src/bin/secrets/edit.ts
@@ -3,7 +3,8 @@ import os from 'os';
 import { execSync } from 'child_process';
 import Logger, { LogLevel, StreamHandler } from '@matrixai/logger';
 import { utils as clientUtils } from '../../client';
-import * as clientPB from '../../client/clientPB';
+import * as vaultsPB from '../../proto/js/polykey/v1/vaults/vaults_pb';
+import * as secretsPB from '../../proto/js/polykey/v1/secrets/secrets_pb';
 import PolykeyClient from '../../PolykeyClient';
 import * as utils from '../../utils';
 import * as binUtils from '../utils';

diff --git a/src/bin/secrets/env.ts b/src/bin/secrets/env.ts
@@ -1,7 +1,8 @@
 import { spawn } from 'child_process';
 import Logger, { LogLevel, StreamHandler } from '@matrixai/logger';
 import { utils as clientUtils } from '../../client';
-import * as clientPB from '../../client/clientPB';
+import * as vaultsPB from '../../proto/js/polykey/v1/vaults/vaults_pb';
+import * as secretsPB from '../../proto/js/polykey/v1/secrets/secrets_pb';
 import PolykeyClient from '../../PolykeyClient';
 import * as utils from '../../utils';
 import * as binUtils from '../utils';

diff --git a/src/bin/secrets/get.ts b/src/bin/secrets/get.ts
@@ -1,6 +1,7 @@
 import Logger, { LogLevel, StreamHandler } from '@matrixai/logger';
 import { utils as clientUtils } from '../../client';
-import * as clientPB from '../../client/clientPB';
+import * as vaultsPB from '../../proto/js/polykey/v1/vaults/vaults_pb';
+import * as secretsPB from '../../proto/js/polykey/v1/secrets/secrets_pb';
 import PolykeyClient from '../../PolykeyClient';
 import * as utils from '../../utils';
 import * as binUtils from '../utils';

diff --git a/src/bin/secrets/list.ts b/src/bin/secrets/list.ts
@@ -1,6 +1,6 @@
 import Logger, { LogLevel, StreamHandler } from '@matrixai/logger';
 import { utils as clientUtils } from '../../client';
-import * as clientPB from '../../client/clientPB';
+import * as vaultsPB from '../../proto/js/polykey/v1/vaults/vaults_pb';
 import PolykeyClient from '../../PolykeyClient';
 import * as utils from '../../utils';
 import * as binUtils from '../utils';

diff --git a/src/bin/secrets/mkdir.ts b/src/bin/secrets/mkdir.ts
@@ -1,6 +1,6 @@
 import Logger, { LogLevel, StreamHandler } from '@matrixai/logger';
 import { utils as clientUtils } from '../../client';
-import * as clientPB from '../../client/clientPB';
+import * as vaultsPB from '../../proto/js/polykey/v1/vaults/vaults_pb';
 import PolykeyClient from '../../PolykeyClient';
 import * as utils from '../../utils';
 import * as binUtils from '../utils';

diff --git a/src/bin/secrets/rename.ts b/src/bin/secrets/rename.ts
@@ -1,6 +1,7 @@
 import Logger, { LogLevel, StreamHandler } from '@matrixai/logger';
 import { utils as clientUtils } from '../../client';
-import * as clientPB from '../../client/clientPB';
+import * as vaultsPB from '../../proto/js/polykey/v1/vaults/vaults_pb';
+import * as secretsPB from '../../proto/js/polykey/v1/secrets/secrets_pb';
 import PolykeyClient from '../../PolykeyClient';
 import * as utils from '../../utils';
 import * as binUtils from '../utils';

diff --git a/src/bin/secrets/update.ts b/src/bin/secrets/update.ts
@@ -1,7 +1,8 @@
 import fs from 'fs';
 import Logger, { LogLevel, StreamHandler } from '@matrixai/logger';
 import { utils as clientUtils } from '../../client';
-import * as clientPB from '../../client/clientPB';
+import * as vaultsPB from '../../proto/js/polykey/v1/vaults/vaults_pb';
+import * as secretsPB from '../../proto/js/polykey/v1/secrets/secrets_pb';
 import PolykeyClient from '../../PolykeyClient';
 import * as utils from '../../utils';
 import * as binUtils from '../utils';

diff --git a/src/bin/vaults/clone.ts b/src/bin/vaults/clone.ts
@@ -1,7 +1,8 @@
 import Logger, { LogLevel, StreamHandler } from '@matrixai/logger';
 import PolykeyClient from '../../PolykeyClient';
 import { utils as clientUtils } from '../../client';
-import * as clientPB from '../../client/clientPB';
+import * as vaultsPB from '../../proto/js/polykey/v1/vaults/vaults_pb';
+import * as nodesPB from '../../proto/js/polykey/v1/nodes/nodes_pb';
 import * as utils from '../../utils';
 import * as binUtils from '../utils';
 import * as grpcErrors from '../../grpc/errors';

diff --git a/src/bin/vaults/create.ts b/src/bin/vaults/create.ts
@@ -1,7 +1,7 @@
 import Logger, { LogLevel, StreamHandler } from '@matrixai/logger';
 import PolykeyClient from '../../PolykeyClient';
 import { utils as clientUtils } from '../../client';
-import * as clientPB from '../../client/clientPB';
+import * as vaultsPB from '../../proto/js/polykey/v1/vaults/vaults_pb';
 import * as utils from '../../utils';
 import * as binUtils from '../utils';
 import * as grpcErrors from '../../grpc/errors';

diff --git a/src/bin/vaults/delete.ts b/src/bin/vaults/delete.ts
@@ -1,7 +1,7 @@
 import Logger, { LogLevel, StreamHandler } from '@matrixai/logger';
 import PolykeyClient from '../../PolykeyClient';
 import { utils as clientUtils } from '../../client';
-import * as clientPB from '../../client/clientPB';
+import * as vaultsPB from '../../proto/js/polykey/v1/vaults/vaults_pb';
 import * as utils from '../../utils';
 import * as binUtils from '../utils';
 import * as grpcErrors from '../../grpc/errors';

diff --git a/src/bin/vaults/list.ts b/src/bin/vaults/list.ts
@@ -1,7 +1,7 @@
 import Logger, { LogLevel, StreamHandler } from '@matrixai/logger';
 import PolykeyClient from '../../PolykeyClient';
 import { utils as clientUtils } from '../../client';
-import * as clientPB from '../../client/clientPB';
+import * as utilsPB from '../../proto/js/polykey/v1/utils/utils_pb';
 import * as utils from '../../utils';
 import * as binUtils from '../utils';
 import * as grpcErrors from '../../grpc/errors';

diff --git a/src/bin/vaults/log.ts b/src/bin/vaults/log.ts
@@ -1,4 +1,4 @@
-import * as clientPB from '../../client/clientPB';
+import * as vaultsPB from '../../proto/js/polykey/v1/vaults/vaults_pb';
 import { createCommand, outputFormatter } from '../utils';
 import Logger, { LogLevel, StreamHandler } from '@matrixai/logger';
 import PolykeyClient from '../../PolykeyClient';

diff --git a/src/bin/vaults/permissions.ts b/src/bin/vaults/permissions.ts
@@ -1,7 +1,8 @@
 import Logger, { LogLevel, StreamHandler } from '@matrixai/logger';
 import PolykeyClient from '../../PolykeyClient';
 import { utils as clientUtils } from '../../client';
-import * as clientPB from '../../client/clientPB';
+import * as vaultsPB from '../../proto/js/polykey/v1/vaults/vaults_pb';
+import * as nodesPB from '../../proto/js/polykey/v1/nodes/nodes_pb';
 import * as utils from '../../utils';
 import * as binUtils from '../utils';
 import * as grpcErrors from '../../grpc/errors';

diff --git a/src/bin/vaults/pull.ts b/src/bin/vaults/pull.ts
@@ -1,7 +1,8 @@
 import Logger, { LogLevel, StreamHandler } from '@matrixai/logger';
 import PolykeyClient from '../../PolykeyClient';
 import { utils as clientUtils } from '../../client';
-import * as clientPB from '../../client/clientPB';
+import * as vaultsPB from '../../proto/js/polykey/v1/vaults/vaults_pb';
+import * as nodesPB from '../../proto/js/polykey/v1/nodes/nodes_pb';
 import * as utils from '../../utils';
 import * as binUtils from '../utils';
 import * as grpcErrors from '../../grpc/errors';

diff --git a/src/bin/vaults/rename.ts b/src/bin/vaults/rename.ts
@@ -1,7 +1,7 @@
 import Logger, { LogLevel, StreamHandler } from '@matrixai/logger';
 import PolykeyClient from '../../PolykeyClient';
 import { utils as clientUtils } from '../../client';
-import * as clientPB from '../../client/clientPB';
+import * as vaultsPB from '../../proto/js/polykey/v1/vaults/vaults_pb';
 import * as utils from '../../utils';
 import * as binUtils from '../utils';
 import * as grpcErrors from '../../grpc/errors';

diff --git a/src/bin/vaults/scan.ts b/src/bin/vaults/scan.ts
@@ -1,7 +1,7 @@
 import Logger, { LogLevel, StreamHandler } from '@matrixai/logger';
 import PolykeyClient from '../../PolykeyClient';
 import { utils as clientUtils } from '../../client';
-import * as clientPB from '../../client/clientPB';
+import * as nodesPB from '../../proto/js/polykey/v1/nodes/nodes_pb';
 import * as utils from '../../utils';
 import * as binUtils from '../utils';
 import * as grpcErrors from '../../grpc/errors';

diff --git a/src/bin/vaults/share.ts b/src/bin/vaults/share.ts
@@ -1,7 +1,8 @@
 import Logger, { LogLevel, StreamHandler } from '@matrixai/logger';
 import PolykeyClient from '../../PolykeyClient';
 import { utils as clientUtils } from '../../client';
-import * as clientPB from '../../client/clientPB';
+import * as vaultsPB from '../../proto/js/polykey/v1/vaults/vaults_pb';
+import * as nodesPB from '../../proto/js/polykey/v1/nodes/nodes_pb';
 import * as utils from '../../utils';
 import * as binUtils from '../utils';
 import * as grpcErrors from '../../grpc/errors';

diff --git a/src/bin/vaults/stat.ts b/src/bin/vaults/stat.ts
@@ -1,7 +1,7 @@
 import Logger, { LogLevel, StreamHandler } from '@matrixai/logger';
 import PolykeyClient from '../../PolykeyClient';
 import { utils as clientUtils } from '../../client';
-import * as clientPB from '../../client/clientPB';
+import * as vaultsPB from '../../proto/js/polykey/v1/vaults/vaults_pb';
 import * as utils from '../../utils';
 import * as binUtils from '../utils';
 

diff --git a/src/bin/vaults/unshare.ts b/src/bin/vaults/unshare.ts
@@ -1,7 +1,8 @@
 import Logger, { LogLevel, StreamHandler } from '@matrixai/logger';
 import PolykeyClient from '../../PolykeyClient';
 import { utils as clientUtils } from '../../client';
-import * as clientPB from '../../client/clientPB';
+import * as vaultsPB from '../../proto/js/polykey/v1/vaults/vaults_pb';
+import * as nodesPB from '../../proto/js/polykey/v1/nodes/nodes_pb';
 import * as utils from '../../utils';
 import * as binUtils from '../utils';
 import * as grpcErrors from '../../grpc/errors';

diff --git a/src/bin/vaults/version.ts b/src/bin/vaults/version.ts
@@ -1,4 +1,4 @@
-import * as clientPB from '../../client/clientPB';
+import * as vaultsPB from '../../proto/js/polykey/v1/vaults/vaults_pb';
 import { createCommand, outputFormatter } from '../utils';
 import Logger, { LogLevel, StreamHandler } from '@matrixai/logger';
 import PolykeyClient from '../../PolykeyClient';