diff --git a/package-lock.json b/package-lock.json index b82b26d..66b13b5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,7 +11,7 @@ "dependencies": { "@aws-sdk/client-s3": "^3.395.0", "@pretendonetwork/boss-crypto": "^1.0.0", - "@pretendonetwork/grpc": "^1.0.1", + "@pretendonetwork/grpc": "^1.0.2", "@typegoose/auto-increment": "^3.4.0", "boss-js": "github:PretendoNetwork/boss-js", "cacache": "^18.0.0", @@ -1157,9 +1157,9 @@ "integrity": "sha512-ybd3sB356v5Azxj99R62+7kytgAzfUYuXRJbdOznGL6infgCJ056TjTadN4V48m7t+3f6sPOUgo9YWUFNxlLLg==" }, "node_modules/@pretendonetwork/grpc": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/@pretendonetwork/grpc/-/grpc-1.0.1.tgz", - "integrity": "sha512-qNsZ//+U22KYTYZyjb4J2CnGUyGfYF35bG1D334WNvq4M2ubvVutWZp98ur5/fVW3g5Af6Eq2IuBwFO9xRhQ1w==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/@pretendonetwork/grpc/-/grpc-1.0.2.tgz", + "integrity": "sha512-g78VP+/wY4VIlQ5EXP5lPzXK1uVflrM3ZA0PW1NZi88EaJRqNPVkYmb6iW+FM0j/lxlu07UcwqLJSHsy9eU01Q==", "dependencies": { "long": "^5.2.1", "protobufjs": "^7.2.3" @@ -6291,9 +6291,9 @@ "integrity": "sha512-ybd3sB356v5Azxj99R62+7kytgAzfUYuXRJbdOznGL6infgCJ056TjTadN4V48m7t+3f6sPOUgo9YWUFNxlLLg==" }, "@pretendonetwork/grpc": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/@pretendonetwork/grpc/-/grpc-1.0.1.tgz", - "integrity": "sha512-qNsZ//+U22KYTYZyjb4J2CnGUyGfYF35bG1D334WNvq4M2ubvVutWZp98ur5/fVW3g5Af6Eq2IuBwFO9xRhQ1w==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/@pretendonetwork/grpc/-/grpc-1.0.2.tgz", + "integrity": "sha512-g78VP+/wY4VIlQ5EXP5lPzXK1uVflrM3ZA0PW1NZi88EaJRqNPVkYmb6iW+FM0j/lxlu07UcwqLJSHsy9eU01Q==", "requires": { "long": "^5.2.1", "protobufjs": "^7.2.3" diff --git a/package.json b/package.json index ff0db43..211563b 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ "dependencies": { "@aws-sdk/client-s3": "^3.395.0", "@pretendonetwork/boss-crypto": "^1.0.0", - "@pretendonetwork/grpc": "^1.0.1", + "@pretendonetwork/grpc": "^1.0.2", "@typegoose/auto-increment": "^3.4.0", "boss-js": "github:PretendoNetwork/boss-js", "cacache": "^18.0.0", diff --git a/src/services/grpc/boss/delete-file.ts b/src/services/grpc/boss/delete-file.ts index 0eccfe3..294b1b1 100644 --- a/src/services/grpc/boss/delete-file.ts +++ b/src/services/grpc/boss/delete-file.ts @@ -1,9 +1,9 @@ import { CallContext, Status, ServerError } from 'nice-grpc'; -import { DeleteFileRequest } from '../../../../../grpc-ts/dist/boss/delete_file'; -import { GetUserDataResponse } from '../../../../../grpc-ts/dist/account/get_user_data_rpc'; +import { DeleteFileRequest } from '@pretendonetwork/grpc/boss/delete_file'; +import { GetUserDataResponse } from '@pretendonetwork/grpc/account/get_user_data_rpc'; import { getTaskFileByDataID } from '@/database'; import { AuthenticationCallContextExt } from '@/services/grpc/boss/middleware/authentication-middleware'; -import { Empty } from '../../../../../grpc-ts/dist/boss/google/protobuf/empty'; +import { Empty } from '@pretendonetwork/grpc/boss/google/protobuf/empty'; export async function deleteFile(request: DeleteFileRequest, context: CallContext & AuthenticationCallContextExt): Promise { // * This is asserted in authentication middleware, we know this is never null diff --git a/src/services/grpc/boss/delete-task.ts b/src/services/grpc/boss/delete-task.ts index 9abb82f..6b15d8d 100644 --- a/src/services/grpc/boss/delete-task.ts +++ b/src/services/grpc/boss/delete-task.ts @@ -1,9 +1,9 @@ import { CallContext, Status, ServerError } from 'nice-grpc'; -import { DeleteTaskRequest } from '../../../../../grpc-ts/dist/boss/delete_task'; -import { GetUserDataResponse } from '../../../../../grpc-ts/dist/account/get_user_data_rpc'; +import { DeleteTaskRequest } from '@pretendonetwork/grpc/boss/delete_task'; +import { GetUserDataResponse } from '@pretendonetwork/grpc/account/get_user_data_rpc'; import { getTask } from '@/database'; import { AuthenticationCallContextExt } from '@/services/grpc/boss/middleware/authentication-middleware'; -import { Empty } from '../../../../../grpc-ts/dist/boss/google/protobuf/empty'; +import { Empty } from '@pretendonetwork/grpc/boss/google/protobuf/empty'; export async function deleteTask(request: DeleteTaskRequest, context: CallContext & AuthenticationCallContextExt): Promise { // * This is asserted in authentication middleware, we know this is never null diff --git a/src/services/grpc/boss/implementation.ts b/src/services/grpc/boss/implementation.ts index f50f6ea..2f6491b 100644 --- a/src/services/grpc/boss/implementation.ts +++ b/src/services/grpc/boss/implementation.ts @@ -1,4 +1,4 @@ -import { BOSSServiceImplementation } from '../../../../../grpc-ts/dist/boss/boss_service'; +import { BOSSServiceImplementation } from '@pretendonetwork/grpc/boss/boss_service'; import { listKnownBOSSApps } from '@/services/grpc/boss/list-known-boss-apps'; import { listTasks } from '@/services/grpc/boss/list-tasks'; import { registerTask } from '@/services/grpc/boss/register-task'; diff --git a/src/services/grpc/boss/list-files.ts b/src/services/grpc/boss/list-files.ts index 4803926..dbf666b 100644 --- a/src/services/grpc/boss/list-files.ts +++ b/src/services/grpc/boss/list-files.ts @@ -1,5 +1,5 @@ import { Status, ServerError } from 'nice-grpc'; -import { ListFilesRequest, ListFilesResponse } from '../../../../../grpc-ts/dist/boss/list_files'; +import { ListFilesRequest, ListFilesResponse } from '@pretendonetwork/grpc/boss/list_files'; import { getTaskFiles } from '@/database'; const BOSS_APP_ID_FILTER_REGEX = /^[A-Za-z0-9]*$/; diff --git a/src/services/grpc/boss/list-known-boss-apps.ts b/src/services/grpc/boss/list-known-boss-apps.ts index 1f4fdbb..114858e 100644 --- a/src/services/grpc/boss/list-known-boss-apps.ts +++ b/src/services/grpc/boss/list-known-boss-apps.ts @@ -1,4 +1,4 @@ -import { ListKnownBOSSAppsResponse } from '../../../../../grpc-ts/dist/boss/list_known_boss_apps'; +import { ListKnownBOSSAppsResponse } from '@pretendonetwork/grpc/boss/list_known_boss_apps'; export async function listKnownBOSSApps(): Promise { return { diff --git a/src/services/grpc/boss/list-tasks.ts b/src/services/grpc/boss/list-tasks.ts index ec55f6a..e85845d 100644 --- a/src/services/grpc/boss/list-tasks.ts +++ b/src/services/grpc/boss/list-tasks.ts @@ -1,4 +1,4 @@ -import { ListTasksResponse } from '../../../../../grpc-ts/dist/boss/list_tasks'; +import { ListTasksResponse } from '@pretendonetwork/grpc/boss/list_tasks'; import { getAllTasks } from '@/database'; export async function listTasks(): Promise { diff --git a/src/services/grpc/boss/middleware/authentication-middleware.ts b/src/services/grpc/boss/middleware/authentication-middleware.ts index cfd9faa..dfbb404 100644 --- a/src/services/grpc/boss/middleware/authentication-middleware.ts +++ b/src/services/grpc/boss/middleware/authentication-middleware.ts @@ -1,5 +1,5 @@ import { Status, ServerMiddlewareCall, CallContext, ServerError } from 'nice-grpc'; -import { GetUserDataResponse } from '../../../../../../grpc-ts/dist/account/get_user_data_rpc'; +import { GetUserDataResponse } from '@pretendonetwork/grpc/account/get_user_data_rpc'; import { getUserDataByToken } from '@/util'; const TOKEN_REQUIRED_PATHS = [ diff --git a/src/services/grpc/boss/register-task.ts b/src/services/grpc/boss/register-task.ts index 8118be6..f2a23b0 100644 --- a/src/services/grpc/boss/register-task.ts +++ b/src/services/grpc/boss/register-task.ts @@ -1,6 +1,6 @@ import { CallContext, Status, ServerError } from 'nice-grpc'; -import { RegisterTaskRequest, RegisterTaskResponse } from '../../../../../grpc-ts/dist/boss/register_task'; -import { GetUserDataResponse } from '../../../../../grpc-ts/dist/account/get_user_data_rpc'; +import { RegisterTaskRequest, RegisterTaskResponse } from '@pretendonetwork/grpc/boss/register_task'; +import { GetUserDataResponse } from '@pretendonetwork/grpc/account/get_user_data_rpc'; import { getTask } from '@/database'; import { Task } from '@/models/task'; import { AuthenticationCallContextExt } from '@/services/grpc/boss/middleware/authentication-middleware'; diff --git a/src/services/grpc/boss/update-file-metadata.ts b/src/services/grpc/boss/update-file-metadata.ts index 98d4118..39a61a7 100644 --- a/src/services/grpc/boss/update-file-metadata.ts +++ b/src/services/grpc/boss/update-file-metadata.ts @@ -1,9 +1,9 @@ import { CallContext, Status, ServerError } from 'nice-grpc'; -import { UpdateFileMetadataRequest } from '../../../../../grpc-ts/dist/boss/update_file_metadata'; -import { GetUserDataResponse } from '../../../../../grpc-ts/dist/account/get_user_data_rpc'; +import { UpdateFileMetadataRequest } from '@pretendonetwork/grpc/boss/update_file_metadata'; +import { GetUserDataResponse } from '@pretendonetwork/grpc/account/get_user_data_rpc'; import { getTaskFileByDataID } from '@/database'; import { AuthenticationCallContextExt } from '@/services/grpc/boss/middleware/authentication-middleware'; -import { Empty } from '../../../../../grpc-ts/dist/boss/google/protobuf/empty'; +import { Empty } from '@pretendonetwork/grpc/boss/google/protobuf/empty'; import { isValidFileNotifyCondition, isValidFileType } from '@/util'; export async function updateFileMetadata(request: UpdateFileMetadataRequest, context: CallContext & AuthenticationCallContextExt): Promise { diff --git a/src/services/grpc/boss/update-task.ts b/src/services/grpc/boss/update-task.ts index 3c3271e..c5b8a18 100644 --- a/src/services/grpc/boss/update-task.ts +++ b/src/services/grpc/boss/update-task.ts @@ -1,9 +1,9 @@ import { CallContext, Status, ServerError } from 'nice-grpc'; -import { UpdateTaskRequest } from '../../../../../grpc-ts/dist/boss/update_task'; -import { GetUserDataResponse } from '../../../../../grpc-ts/dist/account/get_user_data_rpc'; +import { UpdateTaskRequest } from '@pretendonetwork/grpc/boss/update_task'; +import { GetUserDataResponse } from '@pretendonetwork/grpc/account/get_user_data_rpc'; import { getTask } from '@/database'; import { AuthenticationCallContextExt } from '@/services/grpc/boss/middleware/authentication-middleware'; -import { Empty } from '../../../../../grpc-ts/dist/boss/google/protobuf/empty'; +import { Empty } from '@pretendonetwork/grpc/boss/google/protobuf/empty'; export async function updateTask(request: UpdateTaskRequest, context: CallContext & AuthenticationCallContextExt): Promise { // * This is asserted in authentication middleware, we know this is never null diff --git a/src/services/grpc/boss/upload-file.ts b/src/services/grpc/boss/upload-file.ts index 25e21bd..4a8a6f3 100644 --- a/src/services/grpc/boss/upload-file.ts +++ b/src/services/grpc/boss/upload-file.ts @@ -1,6 +1,6 @@ import { CallContext, Status, ServerError } from 'nice-grpc'; -import { UploadFileRequest, UploadFileResponse } from '../../../../../grpc-ts/dist/boss/upload_file'; -import { GetUserDataResponse } from '../../../../../grpc-ts/dist/account/get_user_data_rpc'; +import { UploadFileRequest, UploadFileResponse } from '@pretendonetwork/grpc/boss/upload_file'; +import { GetUserDataResponse } from '@pretendonetwork/grpc/account/get_user_data_rpc'; import { encryptWiiU } from '@pretendonetwork/boss-crypto'; import { isValidCountryCode, isValidFileNotifyCondition, isValidFileType, isValidLanguage, md5, uploadCDNFile } from '@/util'; import { getTask, getTaskFile } from '@/database'; diff --git a/src/services/grpc/server.ts b/src/services/grpc/server.ts index 1f1bb07..98b78b2 100644 --- a/src/services/grpc/server.ts +++ b/src/services/grpc/server.ts @@ -1,5 +1,5 @@ import { createServer, Server } from 'nice-grpc'; -import { BOSSDefinition } from '../../../../grpc-ts/dist/boss/boss_service'; +import { BOSSDefinition } from '@pretendonetwork/grpc/boss/boss_service'; import { apiKeyMiddleware } from '@/services/grpc/boss/middleware/api-key-middleware'; import { authenticationMiddleware } from '@/services/grpc/boss/middleware/authentication-middleware'; import { implementation } from '@/services/grpc/boss/implementation'; diff --git a/src/util.ts b/src/util.ts index 2418283..57d07fb 100644 --- a/src/util.ts +++ b/src/util.ts @@ -4,8 +4,8 @@ import { Readable } from 'node:stream'; import fs from 'fs-extra'; import { createChannel, createClient, Metadata } from 'nice-grpc'; import { GetObjectCommand, PutObjectCommand, S3 } from '@aws-sdk/client-s3'; -import { AccountClient, AccountDefinition } from '../../grpc-ts/dist/account/account_service'; -import { GetUserDataResponse } from '../../grpc-ts/dist/account/get_user_data_rpc'; +import { AccountClient, AccountDefinition } from '@pretendonetwork/grpc/account/account_service'; +import { GetUserDataResponse } from '@pretendonetwork/grpc/account/get_user_data_rpc'; import { config, disabledFeatures } from '@/config-manager'; let s3: S3;