@synopackageland/app 0.15.2 → 0.17.0

package/dist/app.d.ts

@@ -3,7 +3,7 @@ import { type Context } from './context.js';
 /** The channel protocol version this SDK speaks. */
 export declare const VERSION = 1;
 /** The SDK's name in hello: node/<package version>. */
-export declare const SDK = "node/0.15.2";
+export declare const SDK = "node/0.17.0";
 /**
  * A method's implementation. params is the request's params as the browser
  * sent them, not checked against P. The result is the data the browser gets,

package/dist/app.js

@@ -5,7 +5,7 @@ import { browserError } from './errors.js';
 /** The channel protocol version this SDK speaks. */
 export const VERSION = 1;
 /** The SDK's name in hello: node/<package version>. */
-export const SDK = 'node/0.15.2';
+export const SDK = 'node/0.17.0';
 const methodName = /^[a-z][a-z0-9_]*(\.[a-z][a-z0-9_]*)+$/;
 const internal = { code: 'internal', message: 'internal error' };
 /** The App: its methods, served on one channel per call. */
@@ -33,16 +33,39 @@ export class App {
         const hello = await channel.recv();
         if (hello?.t !== 'hello' || !Array.isArray(hello.versions) || !hello.versions.includes(VERSION))
             return;
-        await channel.send({ t: 'hello', version: VERSION, sdk: SDK, methods: this.describe().methods });
-        const call = await channel.recv();
-        if (call?.t !== 'call')
+        const batch = hello.batch === 1;
+        await channel.send({ t: 'hello', version: VERSION, sdk: SDK, methods: this.describe().methods, ...(batch ? { batch: 1 } : {}) });
+        const request = await channel.recv();
+        if (!request)
             return;
-        const id = call.id;
-        const state = new Call(channel, call.ctx);
-        void follow(channel, id, state);
-        const result = await this.#answer(id, call, state.ctx);
-        state.close();
-        await channel.write(result);
+        if (batch && (request.t !== 'batch' || request.v !== 1 || !Array.isArray(request.calls) || request.calls.length < 1 || request.calls.length > 8))
+            return;
+        const calls = batch ? request.calls : [request];
+        const batchStartedAt = Date.now();
+        const states = new Map();
+        void (async () => {
+            for (let f = await channel.recv(); f; f = await channel.recv()) {
+                if (f.t === 'svc_result')
+                    for (const state of states.values())
+                        state.answer(f);
+                else if (f.t === 'cancel')
+                    for (const state of states.values())
+                        state.cancel(f.reason === 'deadline' ? 'deadline' : 'canceled');
+            }
+            for (const state of states.values())
+                state.close();
+        })();
+        for (let i = 0; i < calls.length; i++) {
+            const call = calls[i];
+            if (call.t !== 'call')
+                return;
+            const id = call.id;
+            const state = new Call(channel, call.ctx, batch ? i : undefined, batch ? batchStartedAt : undefined);
+            states.set(id, state);
+            const result = await this.#answer(id, call, state.ctx);
+            state.close();
+            await channel.write(result);
+        }
     }
     /** What --describe prints: the App's methods, for the package build. */
     describe() {
@@ -109,13 +132,3 @@ function takeStdout() {
     stdout.on('error', () => { });
     return new Writable({ write: (chunk, encoding, done) => write(chunk, encoding, done) });
 }
-// Reads the frames that arrive while the handler runs.
-async function follow(channel, id, call) {
-    for (let f = await channel.recv(); f; f = await channel.recv()) {
-        if (f.t === 'svc_result')
-            call.answer(f);
-        else if (f.t === 'cancel' && f.id === id && (f.reason === 'deadline' || f.reason === 'canceled'))
-            call.cancel(f.reason);
-    }
-    call.close();
-}

package/dist/context.d.ts

@@ -41,7 +41,7 @@ export interface Context {
 export declare class Call {
     #private;
     readonly ctx: Context;
-    constructor(channel: Channel, c: CallContext);
+    constructor(channel: Channel, c: CallContext, batchId?: number, startedAt?: number);
     answer(frame: Received): void;
     cancel(reason: CancelReason): void;
     close(): void;

package/dist/context.js

@@ -7,7 +7,9 @@ export class Call {
     #abort = new AbortController();
     #pending = new Map();
     #next = 0;
-    constructor(channel, c) {
+    #batchId;
+    constructor(channel, c, batchId, startedAt) {
+        this.#batchId = batchId;
         this.#channel = channel;
         const signal = this.#abort.signal;
         this.ctx = {
@@ -15,7 +17,7 @@ export class Call {
             admin: c.admin,
             locale: c.locale,
             requestId: c.request_id,
-            deadline: Date.now() + c.deadline_ms,
+            deadline: (startedAt ?? Date.now()) + c.deadline_ms,
             deadlineMs: c.deadline_ms,
             signal,
             get cancelled() {
@@ -29,10 +31,10 @@ export class Call {
             return Promise.reject(new TypeError(`invalid service name: ${op}`));
         if (this.#abort.signal.aborted)
             return Promise.reject(closed(op));
-        const id = `s${++this.#next}`;
+        const id = `${this.#batchId === undefined ? "" : `b${this.#batchId}-`}s${++this.#next}`;
         return new Promise((resolve, reject) => {
             // send throws for params JSON cannot encode; the answer comes later.
-            void this.#channel.send({ t: 'svc', id, op, params });
+            void this.#channel.send({ t: 'svc', id, op, params, ...(this.#batchId === undefined ? {} : { batch_id: this.#batchId }) });
             this.#pending.set(id, { op, resolve, reject });
         });
     }

package/dist/frames.d.ts

@@ -1,4 +1,4 @@
-export type Frame = RuntimeHello | AppHello | Call | Cancel | Svc | SvcResult | Result;
+export type Frame = RuntimeHello | AppHello | Call | Cancel | Svc | SvcResult | Result | Batch;
 export type Method = string;
 export type Id = string;
 export interface RuntimeHello {
@@ -7,12 +7,14 @@ export interface RuntimeHello {
      * @minItems 1
      */
     versions: [number, ...number[]];
+    batch?: 1;
 }
 export interface AppHello {
     t: "hello";
     version: number;
     sdk: string;
     methods: Method[];
+    batch?: 1;
 }
 export interface Call {
     t: "call";
@@ -38,6 +40,7 @@ export interface Svc {
     id: Id;
     op: string;
     params: unknown;
+    batch_id?: number;
 }
 export interface SvcResult {
     t: "svc_result";
@@ -61,3 +64,12 @@ export interface ResultError {
     code: string;
     message: string;
 }
+export interface Batch {
+    t: "batch";
+    v: 1;
+    /**
+     * @minItems 1
+     * @maxItems 8
+     */
+    calls: [Call] | [Call, Call] | [Call, Call, Call] | [Call, Call, Call, Call] | [Call, Call, Call, Call, Call] | [Call, Call, Call, Call, Call, Call] | [Call, Call, Call, Call, Call, Call, Call] | [Call, Call, Call, Call, Call, Call, Call, Call];
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@synopackageland/app",
-  "version": "0.15.2",
+  "version": "0.17.0",
   "description": "Node SDK for Synology Package Land Apps: the backend methods behind the synopkgland Go runtime (channel spec/bridge/v1)",
   "license": "MIT",
   "homepage": "https://github.com/synopackageland/syno-pkg-land-sdk/tree/main/node#readme",