@start9labs/start-sdk 0.4.0-beta.5 → 0.4.0-beta.50

package/base/lib/s9pk/index.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.S9pk = void 0;
 exports.compare = compare;
 const merkleArchive_1 = require("./merkleArchive");
-const mime_types_1 = __importDefault(require("mime-types"));
+const mime_1 = __importDefault(require("mime"));
 const directoryContents_1 = require("./merkleArchive/directoryContents");
 const fileContents_1 = require("./merkleArchive/fileContents");
 const magicAndVersion = new Uint8Array([59, 59, 2]);
@@ -31,46 +31,46 @@ class S9pk {
             .arrayBuffer());
         const magicVersion = new Uint8Array(header.next(magicAndVersion.length));
         if (!compare(magicVersion, magicAndVersion)) {
-            throw new Error("Invalid Magic or Unexpected Version");
+            throw new Error('Invalid Magic or Unexpected Version');
         }
-        const archive = await merkleArchive_1.MerkleArchive.deserialize(source, "s9pk", header, commitment);
+        const archive = await merkleArchive_1.MerkleArchive.deserialize(source, 's9pk', header, commitment);
         const manifest = JSON.parse(new TextDecoder().decode(await archive.contents
-            .getPath(["manifest.json"])
+            .getPath(['manifest.json'])
             ?.verifiedFileContents()));
         return new S9pk(manifest, archive, source.size);
     }
     async icon() {
-        const iconName = Object.keys(this.archive.contents.contents).find((name) => name.startsWith("icon.") &&
-            (mime_types_1.default.contentType(name) || null)?.startsWith("image/"));
+        const iconName = Object.keys(this.archive.contents.contents).find((name) => name.startsWith('icon.') && mime_1.default.getType(name)?.startsWith('image/'));
         if (!iconName) {
-            throw new Error("no icon found in archive");
+            throw new Error('no icon found in archive');
         }
-        return (`data:${mime_types_1.default.contentType(iconName)};base64,` +
-            Buffer.from(await this.archive.contents.getPath([iconName]).verifiedFileContents()).toString("base64"));
+        return (`data:${mime_1.default.getType(iconName)};base64,` +
+            Buffer.from(await this.archive.contents.getPath([iconName]).verifiedFileContents()).toString('base64'));
     }
     async dependencyMetadataFor(id) {
         const entry = this.archive.contents.getPath([
-            "dependencies",
+            'dependencies',
             id,
-            "metadata.json",
+            'metadata.json',
         ]);
         if (!entry)
             return null;
         return JSON.parse(new TextDecoder().decode(await entry.verifiedFileContents()));
     }
     async dependencyIconFor(id) {
-        const dir = this.archive.contents.getPath(["dependencies", id]);
+        const dir = this.archive.contents.getPath(['dependencies', id]);
         if (!dir || !(dir.contents instanceof directoryContents_1.DirectoryContents))
             return null;
-        const iconName = Object.keys(dir.contents.contents).find((name) => name.startsWith("icon.") &&
-            (mime_types_1.default.contentType(name) || null)?.startsWith("image/"));
+        const iconName = Object.keys(dir.contents.contents).find((name) => name.startsWith('icon.') && mime_1.default.getType(name)?.startsWith('image/'));
         if (!iconName)
             return null;
-        return (`data:${mime_types_1.default.contentType(iconName)};base64,` +
-            Buffer.from(await dir.contents.getPath([iconName]).verifiedFileContents()).toString("base64"));
+        return (`data:${mime_1.default.getType(iconName)};base64,` +
+            Buffer.from(await dir.contents.getPath([iconName]).verifiedFileContents()).toString('base64'));
     }
     async dependencyMetadata() {
-        return Object.fromEntries(await Promise.all(Object.entries(this.manifest.dependencies).map(async ([id, info]) => [
+        return Object.fromEntries(await Promise.all(Object.entries(this.manifest.dependencies)
+            .filter(([_, info]) => !!info)
+            .map(async ([id, info]) => [
             id,
             {
                 ...(await this.dependencyMetadataFor(id)),
@@ -80,16 +80,10 @@ class S9pk {
             },
         ])));
     }
-    async instructions() {
-        const file = this.archive.contents.getPath(["instructions.md"]);
-        if (!file || !(file.contents instanceof fileContents_1.FileContents))
-            throw new Error("instructions.md not found in archive");
-        return new TextDecoder().decode(await file.verifiedFileContents());
-    }
     async license() {
-        const file = this.archive.contents.getPath(["LICENSE.md"]);
+        const file = this.archive.contents.getPath(['LICENSE.md']);
         if (!file || !(file.contents instanceof fileContents_1.FileContents))
-            throw new Error("instructions.md not found in archive");
+            throw new Error('license.md not found in archive');
         return new TextDecoder().decode(await file.verifiedFileContents());
     }
 }

package/base/lib/s9pk/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../base/lib/s9pk/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../base/lib/s9pk/index.ts"],"names":[],"mappings":"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"}

package/base/lib/s9pk/merkleArchive/directoryContents.d.ts

@@ -1,4 +1,4 @@
-import { ArrayBufferReader, Entry } from ".";
+import { ArrayBufferReader, Entry } from '.';
 export declare class DirectoryContents {
     readonly contents: {
         [name: string]: Entry;

package/base/lib/s9pk/merkleArchive/directoryContents.js

@@ -13,7 +13,7 @@ class DirectoryContents {
         const position = header.nextU64();
         const size = header.nextU64();
         if (size > maxSize) {
-            throw new Error("size is greater than signed");
+            throw new Error('size is greater than signed');
         }
         const tocReader = new _1.ArrayBufferReader(await source
             .slice(Number(position), Number(position + size))
@@ -27,7 +27,7 @@ class DirectoryContents {
         }
         const res = new DirectoryContents(entries);
         if (!(0, __1.compare)(res.sighash(), sighash)) {
-            throw new Error("hash sum does not match");
+            throw new Error('hash sum does not match');
         }
         return res;
     }

package/base/lib/s9pk/merkleArchive/fileContents.d.ts

@@ -1,4 +1,4 @@
-import { ArrayBufferReader } from ".";
+import { ArrayBufferReader } from '.';
 export declare class FileContents {
     readonly contents: Blob;
     private constructor();

package/base/lib/s9pk/merkleArchive/fileContents.js

@@ -14,7 +14,7 @@ class FileContents {
     async verified(hash) {
         const res = await this.contents.arrayBuffer();
         if (!(0, __1.compare)(hash, (0, blake3_1.blake3)(new Uint8Array(res)))) {
-            throw new Error("hash sum mismatch");
+            throw new Error('hash sum mismatch');
         }
         return res;
     }

package/base/lib/s9pk/merkleArchive/index.d.ts

@@ -1,6 +1,6 @@
-import { MerkleArchiveCommitment } from "../../osBindings";
-import { DirectoryContents } from "./directoryContents";
-import { FileContents } from "./fileContents";
+import { MerkleArchiveCommitment } from '../../osBindings';
+import { DirectoryContents } from './directoryContents';
+import { FileContents } from './fileContents';
 export type Signer = {
     pubkey: Uint8Array;
     signature: Uint8Array;

package/base/lib/s9pk/merkleArchive/index.js

@@ -27,7 +27,7 @@ class ArrayBufferReader {
         }
         const res = p.decode();
         if (res === null) {
-            throw new Error("Reached EOF");
+            throw new Error('Reached EOF');
         }
         return res;
     }
@@ -52,18 +52,18 @@ class MerkleArchive {
             context: new TextEncoder().encode(context),
             zip215: true,
         })) {
-            throw new Error("signature verification failed");
+            throw new Error('signature verification failed');
         }
         if (commitment) {
-            if (!(0, __1.compare)(sighash, new Uint8Array(Buffer.from(commitment.rootSighash, "base64").buffer))) {
-                throw new Error("merkle root mismatch");
+            if (!(0, __1.compare)(sighash, new Uint8Array(Buffer.from(commitment.rootSighash, 'base64').buffer))) {
+                throw new Error('merkle root mismatch');
             }
             if (maxSize > commitment.rootMaxsize) {
-                throw new Error("root directory max size too large");
+                throw new Error('root directory max size too large');
             }
         }
         else if (maxSize > 1024 * 1024) {
-            throw new Error("root directory max size over 1MiB, cancelling download in case of DOS attack");
+            throw new Error('root directory max size over 1MiB, cancelling download in case of DOS attack');
         }
         const contents = await directoryContents_1.DirectoryContents.deserialize(source, header, sighash, maxSize);
         return new MerkleArchive({
@@ -94,10 +94,10 @@ class Entry {
     }
     async verifiedFileContents() {
         if (!this.contents) {
-            throw new Error("file is missing from archive");
+            throw new Error('file is missing from archive');
         }
         if (!(this.contents instanceof fileContents_1.FileContents)) {
-            throw new Error("is not a regular file");
+            throw new Error('is not a regular file');
         }
         return this.contents.verified(this.hash);
     }

package/base/lib/s9pk/merkleArchive/varint.js

@@ -13,7 +13,7 @@ class VarIntProcessor {
     }
     push(b) {
         if (this.i >= maxSize) {
-            throw new Error("Unterminated varint");
+            throw new Error('Unterminated varint');
         }
         this.buf[this.i] = b;
         this.i += 1;

package/base/lib/types/ManifestTypes.d.ts

@@ -1,5 +1,5 @@
-import { T } from "..";
-import { ImageId, ImageSource } from "../types";
+import { T } from '..';
+import { ImageId, ImageSource } from '../types';
 export type SDKManifest = {
     /**
      * The package identifier used by StartOS. This must be unique amongst all other known packages.
@@ -20,32 +20,31 @@ export type SDKManifest = {
      * URL of the StartOS package repository
      * @example `https://github.com/Start9Labs/nextcloud-startos`
      */
-    readonly wrapperRepo: string;
+    readonly packageRepo: string;
     /**
      * URL of the upstream service repository
      * @example `https://github.com/nextcloud/docker`
      */
     readonly upstreamRepo: string;
-    /**
-     * URL where users can get help using the upstream service
-     * @example `https://github.com/nextcloud/docker/issues`
-     */
-    readonly supportSite: string;
     /**
      * URL where users can learn more about the upstream service
      * @example `https://nextcloud.com`
      */
-    readonly marketingSite: string;
+    readonly marketingUrl: string;
     /**
      * (optional) URL where users can donate to the upstream project
      * @example `https://nextcloud.com/contribute/`
      */
     readonly donationUrl: string | null;
+    /**
+     * URL where users can find instructions on how to use the service
+     */
+    readonly docsUrls: string[];
     readonly description: {
         /** Short description to display on the marketplace list page. Max length 80 chars. */
-        readonly short: string;
+        readonly short: T.LocaleString;
         /** Long description to display on the marketplace details page for this service. Max length 500 chars. */
-        readonly long: string;
+        readonly long: T.LocaleString;
     };
     /**
      * override the StartOS version this package was made for
@@ -90,17 +89,17 @@ export type SDKManifest = {
     readonly volumes: string[];
     readonly alerts?: {
         /** An warning alert requiring user confirmation before proceeding with initial installation of this service. */
-        readonly install?: string | null;
+        readonly install?: T.LocaleString | null;
         /** An warning alert requiring user confirmation before updating this service. */
-        readonly update?: string | null;
+        readonly update?: T.LocaleString | null;
         /** An warning alert requiring user confirmation before uninstalling this service. */
-        readonly uninstall?: string | null;
+        readonly uninstall?: T.LocaleString | null;
         /** An warning alert requiring user confirmation before restoring this service from backup. */
-        readonly restore?: string | null;
+        readonly restore?: T.LocaleString | null;
         /** An warning alert requiring user confirmation before starting this service. */
-        readonly start?: string | null;
+        readonly start?: T.LocaleString | null;
         /** An warning alert requiring user confirmation before stopping this service. */
-        readonly stop?: string | null;
+        readonly stop?: T.LocaleString | null;
     };
     /**
      * @description A mapping of service dependencies to be displayed to users when viewing the Marketplace
@@ -122,40 +121,58 @@ export type SDKManifest = {
     /**
      * @description (optional) A set of hardware requirements for this service. If the user's machine
      *   does not meet these requirements, they will not be able to install this service.
-     * @property {object[]} devices - TODO Aiden confirm type on the left. List of required devices (displays or processors).
+     * @property {object[]} devices - List of required devices (display or processor).
+     *    `pattern` refers to a regular expression that at least one device of the specified class must match
+     *    `patternDescription` is what will be displayed to the user about what kind of device is required
      * @property {number} ram - Minimum RAM requirement (in megabytes MB)
-     * @property {string[]} arch - List of supported arches
      * @example
      * ```
-      TODO Aiden verify below and provide examples for devices
       hardwareRequirements: {
         devices: [
-          { class: 'display', value: '' },
-          { class: 'processor', value: '' },
+          { class: 'display', pattern: 'CometLake', patternDescription: 'A CometLake (10th generation) Intel Integrated GPU' },
+          { class: 'processor', pattern: 'i[3579]-10[0-9]{3}U CPU', patternDescription: 'A 10th Generation Intel i-Series processor' },
         ],
         ram: 8192,
-        arch: ['x86-64'],
       },
      * ```
      */
     readonly hardwareRequirements?: {
         readonly device?: T.DeviceFilter[];
         readonly ram?: number | null;
-        readonly arch?: string[] | null;
     };
+    /**
+     * @description Enable access to hardware acceleration devices (such as /dev/dri, or /dev/nvidia*)
+     */
+    readonly hardwareAcceleration?: boolean;
+    /**
+     * @description Enable OS plugins
+     */
+    readonly plugins?: T.PluginId[];
 };
 type ArchOptions = {
-    0: ["x86_64", "aarch64"];
-    1: ["aarch64", "x86_64"];
-    2: ["x86_64"];
-    3: ["aarch64"];
+    0: ['x86_64', 'aarch64', 'riscv64'];
+    1: ['aarch64', 'x86_64', 'riscv64'];
+    2: ['x86_64', 'riscv64', 'aarch64'];
+    3: ['aarch64', 'riscv64', 'x86_64'];
+    4: ['riscv64', 'x86_64', 'aarch64'];
+    5: ['riscv64', 'aarch64', 'x86_64'];
+    6: ['x86_64', 'aarch64'];
+    7: ['aarch64', 'x86_64'];
+    8: ['x86_64', 'riscv64'];
+    9: ['aarch64', 'riscv64'];
+    10: ['riscv64', 'aarch64'];
+    11: ['riscv64', 'x86_64'];
+    12: ['x86_64'];
+    13: ['aarch64'];
+    14: ['riscv64'];
 };
 export type SDKImageInputSpec = {
     [A in keyof ArchOptions]: {
-        source: Exclude<ImageSource, "packed">;
+        source: Exclude<ImageSource, 'packed'>;
         arch?: ArchOptions[A];
         emulateMissingAs?: ArchOptions[A][number] | null;
+        nvidiaContainer?: boolean;
     };
 }[keyof ArchOptions];
-export type ManifestDependency = T.Manifest["dependencies"][string];
+export type ManifestDependency = T.Manifest['dependencies'][string];
 export {};

package/base/lib/types.d.ts

@@ -1,19 +1,19 @@
-export * as inputSpecTypes from "./actions/input/inputSpecTypes";
-import { DependencyRequirement, NamedHealthCheckResult, Manifest, ServiceInterface, ActionId } from "./osBindings";
-import { Affine, StringObject, ToKebab } from "./util";
-import { Action, Actions } from "./actions/setupActions";
-import { Effects } from "./Effects";
+export * as inputSpecTypes from './actions/input/inputSpecTypes';
+import { DependencyRequirement, NamedHealthCheckResult, Manifest, ServiceInterface, ActionId } from './osBindings';
+import { StringObject, ToKebab } from './util';
+import { Action, Actions } from './actions/setupActions';
+import { Effects } from './Effects';
+import { ExtendedVersion, VersionRange } from './exver';
 export { Effects };
-export * from "./osBindings";
-export { SDKManifest } from "./types/ManifestTypes";
-export { RequiredDependenciesOf as RequiredDependencies, OptionalDependenciesOf as OptionalDependencies, CurrentDependenciesResult, } from "./dependencies/setupDependencies";
-export type ExposedStorePaths = string[] & Affine<"ExposedStorePaths">;
+export * from './osBindings';
+export { SDKManifest } from './types/ManifestTypes';
+export { RequiredDependenciesOf as RequiredDependencies, OptionalDependenciesOf as OptionalDependencies, CurrentDependenciesResult, } from './dependencies/setupDependencies';
 export type DaemonBuildable = {
     build(): Promise<{
         term(): Promise<void>;
     }>;
 };
-export type ServiceInterfaceType = "ui" | "p2p" | "api";
+export type ServiceInterfaceType = 'ui' | 'p2p' | 'api';
 export type Signals = NodeJS.Signals;
 export declare const SIGTERM: Signals;
 export declare const SIGKILL: Signals;
@@ -28,57 +28,36 @@ export declare namespace ExpectedExports {
     type createBackup = (options: {
         effects: Effects;
     }) => Promise<unknown>;
-    /** For restoring service data that was previously backed up using the startOS UI create backup flow. Backup restores are also triggered via the startOS UI, or doing a system restore flow during setup. */
-    type restoreBackup = (options: {
-        effects: Effects;
-    }) => Promise<unknown>;
     /**
      * This is the entrypoint for the main container. Used to start up something like the service that the
      * package represents, like running a bitcoind in a bitcoind-wrapper.
      */
     type main = (options: {
         effects: Effects;
-        started(onTerm: () => PromiseLike<void>): PromiseLike<null>;
     }) => Promise<DaemonBuildable>;
-    /**
-     * After a shutdown, if we wanted to do any operations to clean up things, like
-     * set the action as unavailable or something.
-     */
-    type afterShutdown = (options: {
-        effects: Effects;
-    }) => Promise<unknown>;
     /**
      * Every time a service launches (both on startup, and on install) this function is called before packageInit
      * Can be used to register callbacks
      */
-    type containerInit = (options: {
-        effects: Effects;
-    }) => Promise<unknown>;
-    /**
-     * Every time a package completes an install, this function is called before the main.
-     * Can be used to do migration like things.
-     */
-    type packageInit = (options: {
+    type init = (options: {
         effects: Effects;
+        kind: 'install' | 'update' | 'restore' | null;
     }) => Promise<unknown>;
     /** This will be ran during any time a package is uninstalled, for example during a update
      * this will be called.
      */
-    type packageUninit = (options: {
+    type uninit = (options: {
         effects: Effects;
-        nextVersion: null | string;
+        target: ExtendedVersion | VersionRange | null;
     }) => Promise<unknown>;
     type manifest = Manifest;
-    type actions = Actions<any, Record<ActionId, Action<ActionId, any, any>>>;
+    type actions = Actions<Record<ActionId, Action<ActionId, any>>>;
 }
 export type ABI = {
     createBackup: ExpectedExports.createBackup;
-    restoreBackup: ExpectedExports.restoreBackup;
     main: ExpectedExports.main;
-    afterShutdown: ExpectedExports.afterShutdown;
-    containerInit: ExpectedExports.containerInit;
-    packageInit: ExpectedExports.packageInit;
-    packageUninit: ExpectedExports.packageUninit;
+    init: ExpectedExports.init;
+    uninit: ExpectedExports.uninit;
     manifest: ExpectedExports.manifest;
     actions: ExpectedExports.actions;
 };
@@ -93,7 +72,7 @@ export type Daemon = {
     term(): Promise<null>;
     [DaemonProof]: never;
 };
-export type HealthStatus = NamedHealthCheckResult["result"];
+export type HealthStatus = NamedHealthCheckResult['result'];
 export type SmtpValue = {
     server: string;
     port: number;
@@ -103,8 +82,10 @@ export type SmtpValue = {
 };
 export declare class UseEntrypoint {
     readonly overridCmd?: string[] | undefined;
+    readonly USE_ENTRYPOINT = "USE_ENTRYPOINT";
     constructor(overridCmd?: string[] | undefined);
 }
+export declare function isUseEntrypoint(command: CommandType): command is UseEntrypoint;
 export type CommandType = string | [string, ...string[]] | UseEntrypoint;
 export type DaemonReturned = {
     wait(): Promise<unknown>;
@@ -119,10 +100,6 @@ export type Hostname = string & {
 };
 export type ServiceInterfaceId = string;
 export { ServiceInterface };
-export type ExposeServicePaths<Store = never> = {
-    /** The path to the value in the Store. [JsonPath](https://jsonpath.com/)  */
-    paths: ExposedStorePaths;
-};
 export type EffectMethod<T extends StringObject = Effects> = {
     [K in keyof T]-?: K extends string ? T[K] extends Function ? ToKebab<K> : T[K] extends StringObject ? `${ToKebab<K>}.${EffectMethod<T[K]>}` : never : never;
 }[keyof T];
@@ -155,7 +132,7 @@ export type SetResult = {
 };
 export type PackageId = string;
 export type Message = string;
-export type DependencyKind = "running" | "exists";
+export type DependencyKind = 'running' | 'exists';
 export type DependsOn = {
     [packageId: string]: string[] | readonly string[];
 };
@@ -165,6 +142,17 @@ export type KnownError = {
     errorCode: [number, string] | readonly [number, string];
 };
 export type Dependencies = Array<DependencyRequirement>;
-export type DeepPartial<T> = T extends unknown[] ? T : T extends {} ? {
+export type DeepPartial<T> = T extends [infer A, ...infer Rest] ? [DeepPartial<A>, ...DeepPartial<Rest>] : T extends {} ? {
     [P in keyof T]?: DeepPartial<T[P]>;
 } : T;
+export type DeepWritable<T> = {
+    -readonly [K in keyof T]: T[K];
+};
+export declare function writable<T>(value: T): DeepWritable<T>;
+export type DeepReadonly<T> = {
+    readonly [P in keyof T]: DeepReadonly<T[P]>;
+};
+export declare function readonly<T>(value: T): DeepReadonly<T>;
+export type AllowReadonly<T> = T | {
+    readonly [P in keyof T]: AllowReadonly<T[P]>;
+};

package/base/lib/types.js

@@ -37,10 +37,13 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UseEntrypoint = exports.ExpectedExports = exports.NO_TIMEOUT = exports.SIGKILL = exports.SIGTERM = exports.inputSpecTypes = void 0;
+exports.isUseEntrypoint = isUseEntrypoint;
+exports.writable = writable;
+exports.readonly = readonly;
 exports.inputSpecTypes = __importStar(require("./actions/input/inputSpecTypes"));
 __exportStar(require("./osBindings"), exports);
-exports.SIGTERM = "SIGTERM";
-exports.SIGKILL = "SIGKILL";
+exports.SIGTERM = 'SIGTERM';
+exports.SIGKILL = 'SIGKILL';
 exports.NO_TIMEOUT = -1;
 var ExpectedExports;
 (function (ExpectedExports) {
@@ -49,7 +52,17 @@ var ExpectedExports;
 class UseEntrypoint {
     constructor(overridCmd) {
         this.overridCmd = overridCmd;
+        this.USE_ENTRYPOINT = 'USE_ENTRYPOINT';
     }
 }
 exports.UseEntrypoint = UseEntrypoint;
+function isUseEntrypoint(command) {
+    return typeof command === 'object' && 'USE_ENTRYPOINT' in command;
+}
+function writable(value) {
+    return value;
+}
+function readonly(value) {
+    return value;
+}
 //# sourceMappingURL=types.js.map

package/base/lib/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../base/lib/types.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,iFAAgE;AAahE,+CAA4B;AAkBf,QAAA,OAAO,GAAY,SAAS,CAAA;AAC5B,QAAA,OAAO,GAAY,SAAS,CAAA;AAC5B,QAAA,UAAU,GAAG,CAAC,CAAC,CAAA;AAI5B,IAAiB,eAAe,CAsD/B;AAtDD,WAAiB,eAAe;IAC9B,OAAO,EAAE,CAAC,CAAA;AAqDZ,CAAC,EAtDgB,eAAe,+BAAf,eAAe,QAsD/B;AAkCD,MAAa,aAAa;IACxB,YAAqB,UAAqB;QAArB,eAAU,GAAV,UAAU,CAAW;IAAG,CAAC;CAC/C;AAFD,sCAEC"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../base/lib/types.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAsGA,0CAIC;AAmFD,4BAEC;AAMD,4BAEC;AAvMD,iFAAgE;AAchE,+CAA4B;AAgBf,QAAA,OAAO,GAAY,SAAS,CAAA;AAC5B,QAAA,OAAO,GAAY,SAAS,CAAA;AAC5B,QAAA,UAAU,GAAG,CAAC,CAAC,CAAA;AAI5B,IAAiB,eAAe,CA+B/B;AA/BD,WAAiB,eAAe;IAC9B,OAAO,EAAE,CAAC,CAAA;AA8BZ,CAAC,EA/BgB,eAAe,+BAAf,eAAe,QA+B/B;AA+BD,MAAa,aAAa;IAExB,YAAqB,UAAqB;QAArB,eAAU,GAAV,UAAU,CAAW;QADjC,mBAAc,GAAG,gBAAgB,CAAA;IACG,CAAC;CAC/C;AAHD,sCAGC;AACD,SAAgB,eAAe,CAC7B,OAAoB;IAEpB,OAAO,OAAO,OAAO,KAAK,QAAQ,IAAI,gBAAgB,IAAI,OAAO,CAAA;AACnE,CAAC;AAmFD,SAAgB,QAAQ,CAAI,KAAQ;IAClC,OAAO,KAAK,CAAA;AACd,CAAC;AAMD,SAAgB,QAAQ,CAAI,KAAQ;IAClC,OAAO,KAAK,CAAA;AACd,CAAC"}

package/base/lib/util/Drop.d.ts

@@ -0,0 +1,47 @@
+declare const dropId: unique symbol;
+export type DropRef = {
+    [dropId]: number;
+};
+export declare abstract class Drop {
+    private static weak;
+    private static registry;
+    private static idCtr;
+    private dropId?;
+    private dropRef?;
+    protected constructor();
+    protected register(): void;
+    private weak;
+    abstract onDrop(): void;
+    drop(): void;
+    leak(): this;
+}
+export declare class DropPromise<T> implements Promise<T> {
+    private readonly promise;
+    private static dropFns;
+    private static registry;
+    private static idCtr;
+    private dropId;
+    private dropRef;
+    [Symbol.toStringTag]: string;
+    private constructor();
+    static of<T>(promise: Promise<T>, dropFn?: () => void): DropPromise<T>;
+    static ref<T>(promise: Promise<T>, dropRef: DropRef): DropPromise<T>;
+    then<TResult1 = T, TResult2 = never>(onfulfilled?: ((value: T) => TResult1 | PromiseLike<TResult1>) | null | undefined, onrejected?: ((reason: any) => TResult2 | PromiseLike<TResult2>) | null | undefined): Promise<TResult1 | TResult2>;
+    catch<TResult = never>(onrejected?: ((reason: any) => TResult | PromiseLike<TResult>) | null | undefined): Promise<T | TResult>;
+    finally(onfinally?: (() => void) | null | undefined): Promise<T>;
+}
+export declare class DropGenerator<T = unknown, TReturn = any, TNext = unknown> implements AsyncGenerator<T, TReturn, TNext> {
+    private readonly generator;
+    private static dropFns;
+    private static registry;
+    private static idCtr;
+    private dropId;
+    private dropRef;
+    [Symbol.asyncIterator]: () => this;
+    private constructor();
+    static of<T, TReturn, TNext>(generator: AsyncGenerator<T, TReturn, TNext>, dropFn?: () => void): DropGenerator<T, TReturn, TNext>;
+    next(...args: [] | [TNext]): Promise<IteratorResult<T, TReturn>>;
+    return(value: TReturn | PromiseLike<TReturn>): Promise<IteratorResult<T, TReturn>>;
+    throw(e: any): Promise<IteratorResult<T, TReturn>>;
+}
+export {};