@canton-network/wallet-gateway-remote 0.3.0 → 0.4.0

package/README.md

@@ -18,11 +18,11 @@ Alternatively, you can run it directly through npx (tested with NodeJS v24):
 
 `npx @canton-network/wallet-gateway-remote -c ./config.json`
 
-This exposes:
+By default, the service runs on port `3030`, but this can be overridden via the `-p, --port` CLI argument.
 
-- A dApp JSON-RPC API running on (by default) `localhost:3008`
-- A User JSON-RPC API running on (by default) `localhost:3001`
-- A User web interface running on (by default) `localhost:3002`
+- The User web interface runs on `localhost:3030`
+- The dApp JSON-RPC API is exposed on `localhost:3030/api/v0/dapp`
+- The User JSON-RPC API is exposed on `localhost:3030/api/v0/user`
 
 ## Configuration
 

package/dist/dapp-api/controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"controller.d.ts","sourceRoot":"","sources":["../../src/dapp-api/controller.ts"],"names":[],"mappings":"AAIA,OAAO,EAAmB,WAAW,EAAE,MAAM,kCAAkC,CAAA;AAO/E,OAAO,EAAE,KAAK,EAAE,MAAM,mCAAmC,CAAA;AAQzD,OAAO,EAAE,mBAAmB,EAAE,MAAM,wCAAwC,CAAA;AAC5E,OAAO,EAAE,UAAU,IAAI,gBAAgB,EAAE,MAAM,qBAAqB,CAAA;AACpE,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AA6B7B,eAAO,MAAM,cAAc,GACvB,YAAY,gBAAgB,EAC5B,OAAO,KAAK,EACZ,qBAAqB,mBAAmB,EACxC,SAAS,MAAM,EACf,UAAU,WAAW;;;;;;;;;;;CA6IxB,CAAA"}
+{"version":3,"file":"controller.d.ts","sourceRoot":"","sources":["../../src/dapp-api/controller.ts"],"names":[],"mappings":"AAIA,OAAO,EAAmB,WAAW,EAAE,MAAM,kCAAkC,CAAA;AAO/E,OAAO,EAAE,KAAK,EAAE,MAAM,mCAAmC,CAAA;AAQzD,OAAO,EAAE,mBAAmB,EAAE,MAAM,wCAAwC,CAAA;AAC5E,OAAO,EAAE,UAAU,IAAI,gBAAgB,EAAE,MAAM,qBAAqB,CAAA;AACpE,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AA6B7B,eAAO,MAAM,cAAc,GACvB,YAAY,gBAAgB,EAC5B,OAAO,KAAK,EACZ,qBAAqB,mBAAmB,EACxC,SAAS,MAAM,EACf,UAAU,WAAW;;;;;;;;;;;CA8IxB,CAAA"}

package/dist/dapp-api/controller.js

@@ -26,7 +26,7 @@ export const dappController = (kernelInfo, store, notificationService, _logger,
         connect: async () => ({
             kernel: kernelInfo,
             isConnected: false,
-            userUrl: 'http://localhost:3002/login/',
+            userUrl: 'http://localhost:3030/login/', // TODO: pull user URL from config
         }),
         darsAvailable: async () => ({ dars: ['default-dar'] }),
         ledgerApi: async (params) => {
@@ -72,7 +72,8 @@ export const dappController = (kernelInfo, store, notificationService, _logger,
                 payload: params.commands,
             });
             return {
-                userUrl: `http://localhost:3002/approve/index.html?commandId=${commandId}&partyId=${wallet.partyId}&txHash=${encodeURIComponent(preparedTransactionHash)}&tx=${encodeURIComponent(preparedTransaction)}`,
+                // TODO: pull user base URL / port from config
+                userUrl: `http://localhost:3030/approve/index.html?commandId=${commandId}&partyId=${wallet.partyId}&txHash=${encodeURIComponent(preparedTransactionHash)}&tx=${encodeURIComponent(preparedTransaction)}`,
             };
         },
         prepareReturn: async (params) => {

package/dist/dapp-api/server.d.ts

@@ -1,6 +1,8 @@
+import express from 'express';
 import { Store } from '@canton-network/core-wallet-store';
 import { AuthService, AuthAware } from '@canton-network/core-wallet-auth';
+import { Server } from 'http';
 import { NotificationService } from '../notification/NotificationService.js';
 import { KernelInfo } from '../config/Config.js';
-export declare const dapp: (kernelInfo: KernelInfo, notificationService: NotificationService, authService: AuthService, store: Store & AuthAware<Store>) => import("http").Server<typeof import("http").IncomingMessage, typeof import("http").ServerResponse>;
+export declare const dapp: (route: string, app: express.Express, server: Server, kernelInfo: KernelInfo, notificationService: NotificationService, authService: AuthService, store: Store & AuthAware<Store>) => Server<typeof import("http").IncomingMessage, typeof import("http").ServerResponse>;
 //# sourceMappingURL=server.d.ts.map

package/dist/dapp-api/server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/dapp-api/server.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,KAAK,EAAE,MAAM,mCAAmC,CAAA;AAEzD,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,kCAAkC,CAAA;AAKzE,OAAO,EACH,mBAAmB,EAEtB,MAAM,wCAAwC,CAAA;AAC/C,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAA;AAIhD,eAAO,MAAM,IAAI,GACb,YAAY,UAAU,EACtB,qBAAqB,mBAAmB,EACxC,aAAa,WAAW,EACxB,OAAO,KAAK,GAAG,SAAS,CAAC,KAAK,CAAC,uGAyElC,CAAA"}
+{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/dapp-api/server.ts"],"names":[],"mappings":"AAGA,OAAO,OAAO,MAAM,SAAS,CAAA;AAK7B,OAAO,EAAE,KAAK,EAAE,MAAM,mCAAmC,CAAA;AACzD,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,kCAAkC,CAAA;AACzE,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAE7B,OAAO,EACH,mBAAmB,EAEtB,MAAM,wCAAwC,CAAA;AAC/C,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAA;AAIhD,eAAO,MAAM,IAAI,GACb,OAAO,MAAM,EACb,KAAK,OAAO,CAAC,OAAO,EACpB,QAAQ,MAAM,EACd,YAAY,UAAU,EACtB,qBAAqB,mBAAmB,EACxC,aAAa,WAAW,EACxB,OAAO,KAAK,GAAG,SAAS,CAAC,KAAK,CAAC,wFAiElC,CAAA"}

package/dist/dapp-api/server.js

@@ -1,27 +1,18 @@
 // Copyright (c) 2025 Digital Asset (Switzerland) GmbH and/or its affiliates. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
-import express from 'express';
 import { dappController } from './controller.js';
 import { pino } from 'pino';
 import { jsonRpcHandler } from '../middleware/jsonRpcHandler.js';
-import { jwtAuth } from '../middleware/jwtAuth.js';
-import { rpcRateLimit } from '../middleware/rateLimit.js';
-import cors from 'cors';
-import { createServer } from 'http';
-import { Server } from 'socket.io';
+import { Server as SocketIoServer } from 'socket.io';
 const logger = pino({ name: 'main', level: 'debug' });
-export const dapp = (kernelInfo, notificationService, authService, store) => {
-    const app = express();
-    app.use(cors());
-    app.use(express.json());
-    app.use('/rpc', rpcRateLimit, jwtAuth(authService, logger), (req, res, next) => jsonRpcHandler({
+export const dapp = (route, app, server, kernelInfo, notificationService, authService, store) => {
+    app.use(route, (req, res, next) => jsonRpcHandler({
         controller: dappController(kernelInfo, store.withAuthContext(req.authContext), notificationService, logger, req.authContext),
         logger,
     })(req, res, next));
-    const server = createServer(app);
-    const io = new Server(server, {
+    const io = new SocketIoServer(server, {
         cors: {
-            origin: '*',
+            origin: '*', // TODO: read allowedOrigins from config
             methods: ['GET', 'POST'],
         },
     });

package/dist/dapp-api/server.test.js

@@ -1,12 +1,15 @@
 // Copyright (c) 2025 Digital Asset (Switzerland) GmbH and/or its affiliates. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 import { expect, test, jest } from '@jest/globals';
+import cors from 'cors';
 import request from 'supertest';
+import express from 'express';
 import { dapp } from './server.js';
 import { StoreInternal } from '@canton-network/core-wallet-store-inmemory';
 import { ConfigUtils } from '../config/ConfigUtils.js';
 import { pino } from 'pino';
 import { sink } from 'pino-test';
+import { createServer } from 'http';
 const authService = {
     verifyToken: async () => {
         return new Promise((resolve) => resolve({ userId: 'user123', accessToken: 'token123' }));
@@ -23,8 +26,12 @@ const notificationService = {
     }),
 };
 test('call connect rpc', async () => {
-    const response = await request(dapp(config.kernel, notificationService, authService, store))
-        .post('/rpc')
+    const app = express();
+    app.use(cors());
+    app.use(express.json());
+    const server = createServer(app);
+    const response = await request(dapp('/api/v0/dapp', app, server, config.kernel, notificationService, authService, store))
+        .post('/api/v0/dapp')
         .send({ jsonrpc: '2.0', id: 0, method: 'connect', params: [] })
         .set('Accept', 'application/json');
     expect(response.statusCode).toBe(200);
@@ -35,11 +42,11 @@ test('call connect rpc', async () => {
             kernel: {
                 id: 'remote-da',
                 clientType: 'remote',
-                url: 'http://localhost:3008/rpc',
-                userUrl: 'http://localhost:3002',
+                url: 'http://localhost:3030/api/v0/dapp',
+                userUrl: 'http://localhost:3030',
             },
             isConnected: false,
-            userUrl: 'http://localhost:3002/login/',
+            userUrl: 'http://localhost:3030/login/',
         },
     });
 });

package/dist/index.d.ts

@@ -1,3 +1,10 @@
 #!/usr/bin/env node
+declare const options: {
+    config: string;
+    port: string | true;
+    logFormat: "json" | "pretty";
+    storeType: "sqlite" | "postgres";
+};
+export type CliOptions = typeof options;
 export {};
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":""}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AA0CA,QAAA,MAAM,OAAO;;;;;CAAiB,CAAA;AAE9B,MAAM,MAAM,UAAU,GAAG,OAAO,OAAO,CAAA"}

package/dist/index.js

@@ -16,6 +16,7 @@ const program = new Command()
     .version(pkg.version)
     .description('Run a remotely hosted Wallet Gateway')
     .option('-c, --config <path>', 'set config path', './config.json')
+    .option('-p, --port [port]', 'set port', '3030')
     .addOption(new Option('-f, --log-format <format>', 'set log format')
     .choices(['json', 'pretty'])
     .default('pretty'))

package/dist/init.d.ts

@@ -1,9 +1,3 @@
-export declare function initialize(opts: {
-    config: string;
-    logFormat: 'pretty' | 'json';
-}): Promise<{
-    dAppServer: import("http").Server<typeof import("http").IncomingMessage, typeof import("http").ServerResponse>;
-    userServer: import("http").Server<typeof import("http").IncomingMessage, typeof import("http").ServerResponse>;
-    webServer: import("http").Server<typeof import("http").IncomingMessage, typeof import("http").ServerResponse>;
-}>;
+import { CliOptions } from './index.js';
+export declare function initialize(opts: CliOptions): Promise<void>;
 //# sourceMappingURL=init.d.ts.map

package/dist/init.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../src/init.ts"],"names":[],"mappings":"AAmDA,wBAAsB,UAAU,CAAC,IAAI,EAAE;IACnC,MAAM,EAAE,MAAM,CAAA;IACd,SAAS,EAAE,QAAQ,GAAG,MAAM,CAAA;CAC/B;;;;GAkEA"}
+{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../src/init.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAA;AA+BvC,wBAAsB,UAAU,CAAC,IAAI,EAAE,UAAU,iBA2DhD"}

package/dist/init.js

@@ -3,8 +3,8 @@
 import { dapp } from './dapp-api/server.js';
 import { user } from './user-api/server.js';
 import { web } from './web/server.js';
+import cors from 'cors';
 import { pino } from 'pino';
-import ViteExpress from 'vite-express';
 import { StoreSql, connection } from '@canton-network/core-wallet-store-sql';
 import { ConfigUtils } from './config/ConfigUtils.js';
 import EventEmitter from 'events';
@@ -12,12 +12,9 @@ import { SigningProvider } from '@canton-network/core-signing-lib';
 import { ParticipantSigningDriver } from '@canton-network/core-signing-participant';
 import { InternalSigningDriver } from '@canton-network/core-signing-internal';
 import { jwtAuthService } from './auth/jwt-auth-service.js';
-import path, { dirname } from 'path';
-import { fileURLToPath } from 'url';
 import express from 'express';
-const dAppPort = Number(process.env.DAPP_API_PORT) || 3008;
-const userPort = Number(process.env.USER_API_PORT) || 3001;
-const webPort = Number(process.env.WEB_PORT) || 3002;
+import { jwtAuth } from './middleware/jwtAuth.js';
+import { rpcRateLimit } from './middleware/rateLimit.js';
 class NotificationService {
     constructor(logger) {
         this.logger = logger;
@@ -53,22 +50,25 @@ export async function initialize(opts) {
     });
     const notificationService = new NotificationService(logger);
     const config = ConfigUtils.loadConfigFile(opts.config);
+    const port = opts.port ? Number(opts.port) : 3030;
     const store = new StoreSql(connection(config.store), logger);
     const authService = jwtAuthService(store, logger);
     const drivers = {
         [SigningProvider.PARTICIPANT]: new ParticipantSigningDriver(),
         [SigningProvider.WALLET_KERNEL]: new InternalSigningDriver(),
     };
-    const dAppServer = dapp(config.kernel, notificationService, authService, store).listen(dAppPort, () => {
-        logger.info(`dApp Server running at http://localhost:${dAppPort}`);
+    const app = express();
+    app.use(cors()); // TODO: read allowedOrigins from config
+    app.use('/api/*splat', express.json());
+    app.use('/api/*splat', rpcRateLimit);
+    app.use('/api/*splat', jwtAuth(authService, logger));
+    const server = app.listen(port, () => {
+        logger.info(`Remote Wallet Gateway running at http://localhost:${port}`);
     });
-    const userServer = user(config.kernel, notificationService, authService, drivers, store).listen(userPort, () => {
-        logger.info(`User Server running at http://localhost:${userPort}`);
-    });
-    const webServer = process.env.NODE_ENV === 'development'
-        ? ViteExpress.listen(web, webPort, () => logger.info(`Web server running at http://localhost:${webPort}`))
-        : web
-            .use(express.static(path.resolve(dirname(fileURLToPath(import.meta.url)), '../dist/web/frontend')))
-            .listen(webPort, () => logger.info(`Web server running at http://localhost:${webPort}`));
-    return { dAppServer, userServer, webServer };
+    // register dapp API handlers
+    dapp('/api/v0/dapp', app, server, config.kernel, notificationService, authService, store);
+    // register user API handlers
+    user('/api/v0/user', app, config.kernel, notificationService, drivers, store);
+    // register web handler
+    web(app, server);
 }

package/dist/user-api/server.d.ts

@@ -1,7 +1,8 @@
+import express from 'express';
 import { Store } from '@canton-network/core-wallet-store';
-import { AuthService, AuthAware } from '@canton-network/core-wallet-auth';
+import { AuthAware } from '@canton-network/core-wallet-auth';
 import { NotificationService } from '../notification/NotificationService.js';
 import { KernelInfo } from '../config/Config.js';
 import { SigningDriverInterface, SigningProvider } from '@canton-network/core-signing-lib';
-export declare const user: (kernelInfo: KernelInfo, notificationService: NotificationService, authService: AuthService, drivers: Partial<Record<SigningProvider, SigningDriverInterface>>, store: Store & AuthAware<Store>) => import("express-serve-static-core").Express;
+export declare const user: (route: string, app: express.Express, kernelInfo: KernelInfo, notificationService: NotificationService, drivers: Partial<Record<SigningProvider, SigningDriverInterface>>, store: Store & AuthAware<Store>) => express.Express;
 //# sourceMappingURL=server.d.ts.map

package/dist/user-api/server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/user-api/server.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,KAAK,EAAE,MAAM,mCAAmC,CAAA;AACzD,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,kCAAkC,CAAA;AAIzE,OAAO,EAAE,mBAAmB,EAAE,MAAM,wCAAwC,CAAA;AAC5E,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAA;AAChD,OAAO,EACH,sBAAsB,EACtB,eAAe,EAClB,MAAM,kCAAkC,CAAA;AAIzC,eAAO,MAAM,IAAI,GACb,YAAY,UAAU,EACtB,qBAAqB,mBAAmB,EACxC,aAAa,WAAW,EACxB,SAAS,OAAO,CAAC,MAAM,CAAC,eAAe,EAAE,sBAAsB,CAAC,CAAC,EACjE,OAAO,KAAK,GAAG,SAAS,CAAC,KAAK,CAAC,gDAwBlC,CAAA"}
+{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/user-api/server.ts"],"names":[],"mappings":"AAGA,OAAO,OAAO,MAAM,SAAS,CAAA;AAK7B,OAAO,EAAE,KAAK,EAAE,MAAM,mCAAmC,CAAA;AACzD,OAAO,EAAE,SAAS,EAAE,MAAM,kCAAkC,CAAA;AAC5D,OAAO,EAAE,mBAAmB,EAAE,MAAM,wCAAwC,CAAA;AAC5E,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAA;AAChD,OAAO,EACH,sBAAsB,EACtB,eAAe,EAClB,MAAM,kCAAkC,CAAA;AAIzC,eAAO,MAAM,IAAI,GACb,OAAO,MAAM,EACb,KAAK,OAAO,CAAC,OAAO,EACpB,YAAY,UAAU,EACtB,qBAAqB,mBAAmB,EACxC,SAAS,OAAO,CAAC,MAAM,CAAC,eAAe,EAAE,sBAAsB,CAAC,CAAC,EACjE,OAAO,KAAK,GAAG,SAAS,CAAC,KAAK,CAAC,oBAiBlC,CAAA"}

package/dist/user-api/server.js

@@ -1,20 +1,13 @@
 // Copyright (c) 2025 Digital Asset (Switzerland) GmbH and/or its affiliates. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
-import express from 'express';
 import { userController } from './controller.js';
 import { pino } from 'pino';
 import { jsonRpcHandler } from '../middleware/jsonRpcHandler.js';
-import { jwtAuth } from '../middleware/jwtAuth.js';
-import { rpcRateLimit } from '../middleware/rateLimit.js';
-import cors from 'cors';
 const logger = pino({ name: 'main', level: 'debug' });
-export const user = (kernelInfo, notificationService, authService, drivers, store) => {
-    const user = express();
-    user.use(cors());
-    user.use(express.json());
-    user.use('/rpc', rpcRateLimit, jwtAuth(authService, logger), (req, res, next) => jsonRpcHandler({
+export const user = (route, app, kernelInfo, notificationService, drivers, store) => {
+    app.use(route, (req, res, next) => jsonRpcHandler({
         controller: userController(kernelInfo, store.withAuthContext(req.authContext), notificationService, req.authContext, drivers, logger),
         logger,
     })(req, res, next));
-    return user;
+    return app;
 };

package/dist/user-api/server.test.js

@@ -1,17 +1,14 @@
 // Copyright (c) 2025 Digital Asset (Switzerland) GmbH and/or its affiliates. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 import { expect, jest, test } from '@jest/globals';
+import cors from 'cors';
+import express from 'express';
 import request from 'supertest';
 import { user } from './server.js';
 import { StoreInternal } from '@canton-network/core-wallet-store-inmemory';
 import { ConfigUtils } from '../config/ConfigUtils.js';
 import { pino } from 'pino';
 import { sink } from 'pino-test';
-const authService = {
-    verifyToken: async () => {
-        return new Promise((resolve) => resolve({ userId: 'user123', accessToken: 'token123' }));
-    },
-};
 const configPath = '../test/config.json';
 const config = ConfigUtils.loadConfigFile(configPath);
 const store = new StoreInternal(config.store, pino(sink()));
@@ -22,10 +19,13 @@ const notificationService = {
         removeListener: jest.fn(),
     }),
 };
-test('call connect rpc', async () => {
+test('call listNetworks rpc', async () => {
     const drivers = {};
-    const response = await request(user(config.kernel, notificationService, authService, drivers, store))
-        .post('/rpc')
+    const app = express();
+    app.use(cors());
+    app.use(express.json());
+    const response = await request(user('/api/v0/user', app, config.kernel, notificationService, drivers, store))
+        .post('/api/v0/user')
         .send({ jsonrpc: '2.0', id: 0, method: 'listNetworks', params: [] })
         .set('Accept', 'application/json');
     const json = await response.body.result;

package/dist/web/frontend/approve/index.html

@@ -3,13 +3,13 @@
     <head>
         <meta charset="UTF-8" />
         <title>Wallet Kernel - Approve Write Request</title>
-      <script type="module" crossorigin src="/assets/approve-DjrMmUo0.js"></script>
+      <script type="module" crossorigin src="/assets/approve-BHHuvE3i.js"></script>
       <link rel="modulepreload" crossorigin href="/assets/state-manager-BNW0y5PZ.js">
       <link rel="modulepreload" crossorigin href="/assets/index-VtAAU1cN.js">
       <link rel="modulepreload" crossorigin href="/assets/index-BPTkodPz.js">
       <link rel="modulepreload" crossorigin href="/assets/state-DKGJ6EmM.js">
-      <link rel="modulepreload" crossorigin href="/assets/rpc-client-CCUlY3sp.js">
-      <link rel="modulepreload" crossorigin href="/assets/handle-errors-BcwHAkCd.js">
+      <link rel="modulepreload" crossorigin href="/assets/rpc-client-TGo-LOnR.js">
+      <link rel="modulepreload" crossorigin href="/assets/handle-errors-BM-xvD4v.js">
       <link rel="stylesheet" crossorigin href="/assets/index-TZrNw7dA.css">
       <link rel="stylesheet" crossorigin href="/assets/index-BknZMPaI.css">
     </head>