@qlever-llc/trellis 0.6.1 → 0.7.0-rc.3

package/esm/server/service.js

@@ -9,12 +9,18 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _KVHandle_nc;
-import { Trellis, TypedKV, } from "@qlever-llc/trellis";
+var _KVHandle_nc, _StoreHandle_nc;
+import * as dntShim from "../_dnt.shims.js";
+import { jwtAuthenticator, } from "@nats-io/nats-core";
+import { Trellis, TypedKV, TypedStore, } from "@qlever-llc/trellis";
 import { TrellisServer } from "@qlever-llc/trellis/server/runtime";
-import { createAuth } from "@qlever-llc/trellis/auth";
+import { createAuth, SentinelCredsSchema, } from "@qlever-llc/trellis/auth";
+import { ContractResourceBindingsSchema, } from "@qlever-llc/trellis/contracts";
 import { isErr } from "@qlever-llc/result";
+import { Type } from "typebox";
+import { Value } from "typebox/value";
 import { mountStandardHealthRpc } from "./health_rpc.js";
+import { ServiceTransfer } from "./transfer.js";
 function getErrorCauseMessage(error) {
     if (error && typeof error === "object") {
         const context = error.context;
@@ -31,6 +37,64 @@ function bootstrapContractStateError(args) {
     const cause = args.cause ? ` Underlying error: ${getErrorCauseMessage(args.cause)}` : "";
     return new Error(base + cause);
 }
+function runtimeImport(specifier) {
+    const load = new Function("specifier", "return import(specifier);");
+    return load(specifier);
+}
+async function loadDefaultServiceRuntimeDeps() {
+    if ("Deno" in dntShim.dntGlobalThis) {
+        const mod = await runtimeImport("@nats-io/transport-deno");
+        return { connect: mod.connect };
+    }
+    const mod = await runtimeImport("@nats-io/transport-node");
+    return { connect: mod.connect };
+}
+const ServiceBootstrapReadySchema = Type.Object({
+    status: Type.Literal("ready"),
+    connectInfo: Type.Object({
+        sessionKey: Type.String({ minLength: 1 }),
+        contractId: Type.String({ minLength: 1 }),
+        contractDigest: Type.String({ minLength: 1 }),
+        transport: Type.Object({
+            natsServers: Type.Array(Type.String({ minLength: 1 }), { minItems: 1 }),
+            sentinel: SentinelCredsSchema,
+        }, { additionalProperties: false }),
+        auth: Type.Object({
+            mode: Type.Literal("service_identity"),
+            iatSkewSeconds: Type.Integer({ minimum: 1 }),
+        }, { additionalProperties: false }),
+    }, { additionalProperties: false }),
+    binding: Type.Object({
+        contractId: Type.String({ minLength: 1 }),
+        digest: Type.String({ minLength: 1 }),
+        resources: ContractResourceBindingsSchema,
+    }, { additionalProperties: false }),
+}, { additionalProperties: true });
+const ServiceBootstrapFailureSchema = Type.Object({
+    reason: Type.String({ minLength: 1 }),
+}, { additionalProperties: true });
+async function fetchServiceBootstrapInfo(args) {
+    const iat = Math.floor(Date.now() / 1_000);
+    const response = await fetch(new URL("/bootstrap/service", args.trellisUrl), {
+        method: "POST",
+        headers: { "Content-Type": "application/json" },
+        body: JSON.stringify({
+            sessionKey: args.auth.sessionKey,
+            contractId: args.contractId,
+            contractDigest: args.contractDigest,
+            iat,
+            sig: await args.auth.natsConnectSigForIat(iat),
+        }),
+    });
+    const payload = await response.json();
+    if (!response.ok) {
+        if (Value.Check(ServiceBootstrapFailureSchema, payload)) {
+            throw new Error(`Service bootstrap failed: ${payload.reason}`);
+        }
+        throw new Error(`Service bootstrap failed with HTTP ${response.status}`);
+    }
+    return Value.Parse(ServiceBootstrapReadySchema, payload);
+}
 export class KVHandle {
     constructor(nc, binding) {
         Object.defineProperty(this, "binding", {
@@ -53,6 +117,53 @@ export class KVHandle {
     }
 }
 _KVHandle_nc = new WeakMap();
+export class StoreHandle {
+    constructor(nc, binding) {
+        Object.defineProperty(this, "binding", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        _StoreHandle_nc.set(this, void 0);
+        __classPrivateFieldSet(this, _StoreHandle_nc, nc, "f");
+        this.binding = binding;
+    }
+    open() {
+        return TypedStore.open(__classPrivateFieldGet(this, _StoreHandle_nc, "f"), this.binding.name, {
+            ttlMs: this.binding.ttlMs,
+            maxObjectBytes: this.binding.maxObjectBytes,
+            maxTotalBytes: this.binding.maxTotalBytes,
+            bindOnly: true,
+        });
+    }
+}
+_StoreHandle_nc = new WeakMap();
+async function createConnectedService(args) {
+    const runtimeApi = (args.server.trellisApi ?? args.server.api);
+    const server = TrellisServer.create(args.name, args.nc, { sessionKey: args.auth.sessionKey, sign: args.auth.sign }, {
+        log: args.server.log,
+        timeout: args.server.timeout,
+        stream: args.server.stream,
+        noResponderRetry: args.server.noResponderRetry,
+        api: runtimeApi,
+        version: args.server.version,
+    });
+    const outbound = new Trellis(args.name, args.nc, { sessionKey: args.auth.sessionKey, sign: args.auth.sign }, {
+        log: args.server.log,
+        timeout: args.server.timeout,
+        stream: args.server.stream,
+        noResponderRetry: args.server.noResponderRetry,
+        api: runtimeApi,
+    });
+    const trellis = Object.assign(outbound, {
+        mount: server.mount.bind(server),
+    });
+    await mountStandardHealthRpc(server, {
+        checks: args.server.healthChecks,
+    });
+    return new TrellisService(args.name, args.auth, args.nc, server, trellis, args.bindings);
+}
 export class TrellisService {
     constructor(name, auth, nc, server, trellis, bindings) {
         Object.defineProperty(this, "name", {
@@ -91,12 +202,24 @@ export class TrellisService {
             writable: true,
             value: void 0
         });
+        Object.defineProperty(this, "transfer", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
         Object.defineProperty(this, "kv", {
             enumerable: true,
             configurable: true,
             writable: true,
             value: void 0
         });
+        Object.defineProperty(this, "store", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
         Object.defineProperty(this, "streams", {
             enumerable: true,
             configurable: true,
@@ -116,10 +239,48 @@ export class TrellisService {
         this.operations = server.operations;
         this.trellis = trellis;
         this.kv = Object.fromEntries(Object.entries(bindings.kv).map(([alias, binding]) => [alias, new KVHandle(nc, binding)]));
+        this.store = Object.fromEntries(Object.entries(bindings.store).map(([alias, binding]) => [alias, new StoreHandle(nc, binding)]));
+        this.transfer = new ServiceTransfer({
+            name,
+            nc,
+            auth,
+            stores: this.store,
+        });
         this.streams = bindings.streams;
         this.jobs = bindings.jobs;
     }
-    static async connect(name, opts, deps) {
+    static async connect(args, deps) {
+        const runtimeDeps = {
+            ...(await loadDefaultServiceRuntimeDeps()),
+            ...deps,
+        };
+        const auth = await createAuth({ sessionKeySeed: args.sessionKeySeed });
+        const bootstrap = await fetchServiceBootstrapInfo({
+            trellisUrl: args.trellisUrl,
+            contractId: args.contract.CONTRACT_ID,
+            contractDigest: args.contract.CONTRACT_DIGEST,
+            auth,
+        });
+        const { token, inboxPrefix } = await auth.natsConnectOptions();
+        const nc = await runtimeDeps.connect({
+            servers: bootstrap.connectInfo.transport.natsServers,
+            token,
+            inboxPrefix,
+            authenticator: jwtAuthenticator(bootstrap.connectInfo.transport.sentinel.jwt, new TextEncoder().encode(bootstrap.connectInfo.transport.sentinel.seed)),
+        });
+        return await createConnectedService({
+            name: args.name,
+            auth,
+            nc,
+            server: {
+                ...(args.server ?? {}),
+                api: args.contract.API.owned,
+                trellisApi: args.contract.API.trellis,
+            },
+            bindings: bootstrap.binding.resources,
+        });
+    }
+    static async connectInternal(name, opts, deps) {
         const connectFn = deps.connect;
         const readFileSync = deps.readFileSync;
         const credsAuthenticator = deps.credsAuthenticator;
@@ -154,30 +315,21 @@ export class TrellisService {
             authenticator,
             ...(opts.nats.options ?? {}),
         });
-        const runtimeApi = (opts.server.trellisApi ?? opts.server.api);
-        const server = TrellisServer.create(name, nc, { sessionKey: auth.sessionKey, sign: auth.sign }, {
-            log: opts.server.log,
-            timeout: opts.server.timeout,
-            stream: opts.server.stream,
-            noResponderRetry: opts.server.noResponderRetry,
-            api: runtimeApi,
-            version: opts.server.version,
-        });
-        const outbound = new Trellis(name, nc, { sessionKey: auth.sessionKey, sign: auth.sign }, {
-            log: opts.server.log,
-            timeout: opts.server.timeout,
-            stream: opts.server.stream,
-            noResponderRetry: opts.server.noResponderRetry,
-            api: runtimeApi,
-        });
-        const trellis = Object.assign(outbound, {
-            mount: server.mount.bind(server),
-        });
-        await mountStandardHealthRpc(server, {
-            checks: opts.server.healthChecks,
-        });
-        let bindings = { kv: {}, streams: {} };
+        let bindings = { kv: {}, store: {}, streams: {} };
         if (opts.contractId && opts.contractDigest) {
+            const runtimeApi = (opts.server.trellisApi ?? opts.server.api);
+            const outbound = new Trellis(name, nc, { sessionKey: auth.sessionKey, sign: auth.sign }, {
+                log: opts.server.log,
+                timeout: opts.server.timeout,
+                stream: opts.server.stream,
+                noResponderRetry: opts.server.noResponderRetry,
+                api: runtimeApi,
+            });
+            const trellis = Object.assign(outbound, {
+                mount: () => {
+                    throw new Error("mount is unavailable during internal bootstrap probing");
+                },
+            });
             const bootstrapRequest = trellis.request.bind(trellis);
             const catalogResult = await bootstrapRequest("Trellis.Catalog", {});
             const catalogValue = catalogResult.take();
@@ -222,13 +374,21 @@ export class TrellisService {
             }
             bindings = {
                 kv: resolved.binding?.resources?.kv ?? {},
+                store: resolved.binding?.resources?.store ?? {},
                 streams: resolved.binding?.resources?.streams ?? {},
                 ...(resolved.binding?.resources?.jobs ? { jobs: resolved.binding.resources.jobs } : {}),
             };
         }
-        return new TrellisService(name, auth, nc, server, trellis, bindings);
+        return await createConnectedService({
+            name,
+            auth,
+            nc,
+            server: opts.server,
+            bindings,
+        });
     }
     async stop() {
+        await this.transfer.stop();
         await this.server.stop();
     }
     request(method, input, opts) {
@@ -241,16 +401,3 @@ export class TrellisService {
         return this.server.operation(operation);
     }
 }
-export function connectService(contract, name, opts, deps) {
-    const connectOpts = {
-        ...opts,
-        contractId: contract.CONTRACT_ID,
-        contractDigest: contract.CONTRACT_DIGEST,
-        server: {
-            ...opts.server,
-            api: contract.API.owned,
-            trellisApi: contract.API.trellis,
-        },
-    };
-    return TrellisService.connect(name, connectOpts, deps);
-}

package/esm/server/transfer.d.ts

@@ -0,0 +1,41 @@
+import { type Result as ResultType } from "@qlever-llc/result";
+import { type NatsConnection } from "@nats-io/nats-core";
+import type { TrellisAuth } from "../trellis/trellis.js";
+import type { StoreError } from "../trellis/errors/StoreError.js";
+import { TransferError } from "../trellis/errors/TransferError.js";
+import { TypedStore } from "../trellis/store.js";
+import type { DownloadTransferGrant, UploadTransferGrant } from "../trellis/transfer.js";
+export type TransferStoreHandle = {
+    open(): Promise<ResultType<TypedStore, StoreError>>;
+};
+export type InitiateUploadArgs = {
+    sessionKey: string;
+    store: string;
+    key: string;
+    expiresInMs: number;
+    maxBytes?: number;
+    contentType?: string;
+    metadata?: Record<string, string>;
+};
+export type InitiateDownloadArgs = {
+    sessionKey: string;
+    store: string;
+    key: string;
+    expiresInMs: number;
+};
+type ServiceTransferOpts = {
+    name: string;
+    nc: NatsConnection;
+    auth: TrellisAuth;
+    stores: Record<string, TransferStoreHandle>;
+    chunkBytes?: number;
+};
+export declare class ServiceTransfer {
+    #private;
+    constructor(opts: ServiceTransferOpts);
+    initiateUpload(args: InitiateUploadArgs): Promise<ResultType<UploadTransferGrant, TransferError>>;
+    initiateDownload(args: InitiateDownloadArgs): Promise<ResultType<DownloadTransferGrant, TransferError>>;
+    stop(): Promise<void>;
+}
+export {};
+//# sourceMappingURL=transfer.d.ts.map

package/esm/server/transfer.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"transfer.d.ts","sourceRoot":"","sources":["../../src/server/transfer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiB,KAAK,MAAM,IAAI,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAC9E,OAAO,EAAoC,KAAK,cAAc,EAAqB,MAAM,oBAAoB,CAAC;AAG9G,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAClE,OAAO,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAC;AACnE,OAAO,EAAkB,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACjE,OAAO,KAAK,EACV,qBAAqB,EAErB,mBAAmB,EACpB,MAAM,wBAAwB,CAAC;AAShC,MAAM,MAAM,mBAAmB,GAAG;IAChC,IAAI,IAAI,OAAO,CAAC,UAAU,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC,CAAC;CACrD,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACnC,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG;IACjC,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF,KAAK,mBAAmB,GAAG;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,cAAc,CAAC;IACnB,IAAI,EAAE,WAAW,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAC;IAC5C,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,CAAC;AAoJF,qBAAa,eAAe;;gBASd,IAAI,EAAE,mBAAmB;IAQ/B,cAAc,CAAC,IAAI,EAAE,kBAAkB,GAAG,OAAO,CAAC,UAAU,CAAC,mBAAmB,EAAE,aAAa,CAAC,CAAC;IAsDjG,gBAAgB,CAAC,IAAI,EAAE,oBAAoB,GAAG,OAAO,CAAC,UAAU,CAAC,qBAAqB,EAAE,aAAa,CAAC,CAAC;IA8CvG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;CAiN5B"}