spec-3nweb-server 1.7.0 → 1.7.1

package/build/3nstorage/resources/sessions.d.ts

@@ -1,6 +1,6 @@
 import { Request as Req, SessionParams, Factory } from '../../lib-server/resources/sessions';
-export declare type SessionsFactory = Factory<SessionParams>;
-export declare type Request = Req<SessionParams>;
+export type SessionsFactory = Factory<SessionParams>;
+export type Request = Req<SessionParams>;
 /**
  * This returns factory, that works properly in a single process application,
  * clearing up sessions that past given timeout.

package/build/3nstorage/resources/store.d.ts

@@ -5,7 +5,7 @@ import { UserFiles, ObjReader } from '../../lib-server/resources/user-files';
 import { DiffInfo, events, ObjStatus } from '../../lib-common/service-api/3nstorage/owner';
 export { DiffInfo } from '../../lib-common/service-api/3nstorage/owner';
 export { ObjPipe, ObjReader } from '../../lib-server/resources/user-files';
-export declare type StorageEventsSink = (userId: string, channel: events.EventNameType, event: events.AllTypes) => void;
+export type StorageEventsSink = (userId: string, channel: events.EventNameType, event: events.AllTypes) => void;
 export declare const SC: {
     USER_UNKNOWN: string;
     OBJ_EXIST: string;

package/build/3nstorage/resources/users.d.ts

@@ -8,24 +8,24 @@ import { Readable as ReadableStream } from 'stream';
 import { ObjReader, StorageEventsSink } from './store';
 import { PutObjFirstQueryOpts, PutObjSecondQueryOpts, DiffInfo, ObjStatus } from '../../lib-common/service-api/3nstorage/owner';
 export { SC, ObjReader, MismatchedObjVerException } from './store';
-export declare type UserExists = (userId: string) => Promise<boolean>;
-export declare type GetCurrentObj = (userId: string, objId: string | null, header: boolean, segsOffset: number, segsLimit: number | undefined) => Promise<{
+export type UserExists = (userId: string) => Promise<boolean>;
+export type GetCurrentObj = (userId: string, objId: string | null, header: boolean, segsOffset: number, segsLimit: number | undefined) => Promise<{
     version: number;
     reader: ObjReader;
 }>;
-export declare type SaveNewObjVersion = (userId: string, objId: string | null, fstReq: PutObjFirstQueryOpts | undefined, diff: DiffInfo | undefined, sndReq: PutObjSecondQueryOpts | undefined, bytesLen: number, bytes: ReadableStream) => Promise<string | undefined>;
-export declare type GetArchivedObjVersion = (userId: string, objId: string | null, version: number, header: boolean, segsOffset: number, segsLimit: number | undefined) => Promise<ObjReader>;
-export declare type CancelTransaction = (userId: string, objId: string, transactionId?: string) => Promise<void>;
-export declare type ArchiveObjCurrentVersion = (userId: string, objId: string, version: number) => Promise<void>;
-export declare type GetObjStatus = (userId: string, objId: string) => Promise<ObjStatus>;
-export declare type DeleteCurrentObjVersion = (userId: string, objId: string, version?: number) => Promise<void>;
-export declare type DeleteArchivedObjVersion = (userId: string, objId: string | null, version: number) => Promise<void>;
-declare type GetParam<T> = (userId: string) => Promise<T>;
-declare type SetParam<T> = (userId: string, param: T) => Promise<boolean>;
-export declare type GetSpaceQuota = GetParam<number>;
-export declare type GetKeyDerivParams = GetParam<any>;
-export declare type SetKeyDerivParams = SetParam<any>;
-export declare type EventsSink = StorageEventsSink;
+export type SaveNewObjVersion = (userId: string, objId: string | null, fstReq: PutObjFirstQueryOpts | undefined, diff: DiffInfo | undefined, sndReq: PutObjSecondQueryOpts | undefined, bytesLen: number, bytes: ReadableStream) => Promise<string | undefined>;
+export type GetArchivedObjVersion = (userId: string, objId: string | null, version: number, header: boolean, segsOffset: number, segsLimit: number | undefined) => Promise<ObjReader>;
+export type CancelTransaction = (userId: string, objId: string, transactionId?: string) => Promise<void>;
+export type ArchiveObjCurrentVersion = (userId: string, objId: string, version: number) => Promise<void>;
+export type GetObjStatus = (userId: string, objId: string) => Promise<ObjStatus>;
+export type DeleteCurrentObjVersion = (userId: string, objId: string, version?: number) => Promise<void>;
+export type DeleteArchivedObjVersion = (userId: string, objId: string | null, version: number) => Promise<void>;
+type GetParam<T> = (userId: string) => Promise<T>;
+type SetParam<T> = (userId: string, param: T) => Promise<boolean>;
+export type GetSpaceQuota = GetParam<number>;
+export type GetKeyDerivParams = GetParam<any>;
+export type SetKeyDerivParams = SetParam<any>;
+export type EventsSink = StorageEventsSink;
 /**
  * This is an external interface, behind which all storage machinery is hidding.
  */

package/build/admin/resources/users.d.ts

@@ -13,7 +13,7 @@ export declare function validateUserStorageParams(params: UserStorageParams): bo
  * @return a promise, resolvable to available addresses for a given name.
  * If array is empty, there are no available addresses for a given name.
  */
-export declare type IAvailableDomains = (signupToken: string | undefined) => Promise<string[]>;
+export type IAvailableDomains = (signupToken: string | undefined) => Promise<string[]>;
 /**
  * This returns a promise, resolvable to an array of addresses, that are
  * available for a given string. Array may be empty, when there are no
@@ -23,7 +23,7 @@ export declare type IAvailableDomains = (signupToken: string | undefined) => Pro
  * @return a promise, resolvable to available addresses for a given name.
  * If array is empty, there are no available addresses for a given name.
  */
-export declare type IAvailableAddressesForName = (name: string, signupToken: string | undefined) => Promise<string[]>;
+export type IAvailableAddressesForName = (name: string, signupToken: string | undefined) => Promise<string[]>;
 /**
  * This creates a user, returning a promise, resolvable when a new account has
  * been created for a given user id.
@@ -35,7 +35,7 @@ export declare type IAvailableAddressesForName = (name: string, signupToken: str
  * @return a promise, resolvable, when user is added, and all parameters are
  * saved.
  */
-export declare type IAdd = (userId: string, midParams: UserMidParams, storeParams: any, signupToken: string | undefined) => Promise<void>;
+export type IAdd = (userId: string, midParams: UserMidParams, storeParams: any, signupToken: string | undefined) => Promise<void>;
 export interface Factory {
     getAvailableDomains: IAvailableDomains;
     getAvailableAddresses: IAvailableAddressesForName;

package/build/admin/signup-tokens.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="node" />
-export declare type SignupContext = SingleUserSignupCtx | MultiDomainSignupCtx;
+export type SignupContext = SingleUserSignupCtx | MultiDomainSignupCtx;
 export interface SingleUserSignupCtx {
     token: string;
     type: 'single-user';

package/build/asmail/resources/delivery-sessions.d.ts

@@ -11,9 +11,9 @@ export interface SessionParams {
     currentMsgLength: number;
     msgId: string;
 }
-export declare type Request = Req<SessionParams>;
-export declare type GenerateSession = GenSession<SessionParams>;
-export declare type GetSessionForMsg = (recipient: string, msgId: string) => Promise<Session<SessionParams> | undefined>;
+export type Request = Req<SessionParams>;
+export type GenerateSession = GenSession<SessionParams>;
+export type GetSessionForMsg = (recipient: string, msgId: string) => Promise<Session<SessionParams> | undefined>;
 export interface SessionsFactory extends Factory<SessionParams> {
     getSessionForMsg: GetSessionForMsg;
 }

package/build/asmail/resources/inbox.d.ts

@@ -5,15 +5,15 @@ import * as configApi from '../../lib-common/service-api/asmail/config';
 import * as retrievalApi from '../../lib-common/service-api/asmail/retrieval';
 import { UserFiles, ObjReader } from '../../lib-server/resources/user-files';
 export { ObjPipe, ObjReader } from '../../lib-server/resources/user-files';
-declare type AnonSenderPolicy = configApi.p.anonSenderPolicy.Policy;
-export declare type AuthSenderPolicy = configApi.p.authSenderPolicy.Policy;
-declare type Whitelist = configApi.p.authSenderWhitelist.List;
-declare type Blacklist = configApi.p.authSenderBlacklist.List;
-declare type AuthSenderInvites = configApi.p.authSenderInvites.List;
-declare type AnonSenderInvites = configApi.p.anonSenderInvites.List;
-declare type MsgMeta = retrievalApi.MsgMeta;
-export declare type MsgEvents = retrievalApi.msgMainObjRecieved.Event | retrievalApi.msgRecievedCompletely.Event;
-export declare type MailEventsSink = (userId: string, channel: string, event: MsgEvents) => void;
+type AnonSenderPolicy = configApi.p.anonSenderPolicy.Policy;
+export type AuthSenderPolicy = configApi.p.authSenderPolicy.Policy;
+type Whitelist = configApi.p.authSenderWhitelist.List;
+type Blacklist = configApi.p.authSenderBlacklist.List;
+type AuthSenderInvites = configApi.p.authSenderInvites.List;
+type AnonSenderInvites = configApi.p.anonSenderInvites.List;
+type MsgMeta = retrievalApi.MsgMeta;
+export type MsgEvents = retrievalApi.msgMainObjRecieved.Event | retrievalApi.msgRecievedCompletely.Event;
+export type MailEventsSink = (userId: string, channel: string, event: MsgEvents) => void;
 export declare const SC: {
     OBJ_EXIST: string;
     USER_UNKNOWN: string;

package/build/asmail/resources/recipients.d.ts

@@ -10,7 +10,7 @@ export declare const BIN_TYPE = "application/octet-stream";
  * This checks existence of a given user, returning a promise, resolvable
  * either to true, when given user id is known, or to false, when it is not.
  */
-export declare type UserExists = (userId: string) => Promise<boolean>;
+export type UserExists = (userId: string) => Promise<boolean>;
 /**
  * This tells what is an allowable maximum message size for a given recipient,
  * for a given sender and/or under a given invitation token.
@@ -20,46 +20,46 @@ export declare type UserExists = (userId: string) => Promise<boolean>;
  * (3) -1 (less than zero), if mail cannot be accepted due to full mail
  *     box.
  */
-export declare type AllowedMaxMsgSize = (recipient: string, sender: string | undefined, invitation: string | undefined) => Promise<number>;
+export type AllowedMaxMsgSize = (recipient: string, sender: string | undefined, invitation: string | undefined) => Promise<number>;
 /**
  * This allocates storage for a message returning a promise, resolvable to
  * (1) message id, when a folder for new message has been created,
  * (2) undefined, if recipient is unknown.
  */
-export declare type SetMsgStorage = (recipient: string, msgMeta: deliveryApi.msgMeta.Request, authSender: string | undefined, invite: string | undefined, maxMsgLength: number) => Promise<string>;
+export type SetMsgStorage = (recipient: string, msgMeta: deliveryApi.msgMeta.Request, authSender: string | undefined, invite: string | undefined, maxMsgLength: number) => Promise<string>;
 /**
  * This saves object's bytes, returning a promise, resolvable when saving
  * is OK, otherwise, promise rejects with string error code from SC.
  */
-export declare type SaveObj = (recipient: string, msgId: string, objId: string, fstReq: deliveryApi.PutObjFirstQueryOpts | undefined, sndReq: deliveryApi.PutObjSecondQueryOpts | undefined, bytesLen: number, bytes: Readable) => Promise<void>;
+export type SaveObj = (recipient: string, msgId: string, objId: string, fstReq: deliveryApi.PutObjFirstQueryOpts | undefined, sndReq: deliveryApi.PutObjSecondQueryOpts | undefined, bytesLen: number, bytes: Readable) => Promise<void>;
 /**
  * This finalizes delivery of a message, returning a promise.
  * Rejected promise may have a string error code from SC.
  */
-export declare type FinalizeDelivery = (recipient: string, msgId: string) => Promise<void>;
+export type FinalizeDelivery = (recipient: string, msgId: string) => Promise<void>;
 /**
  * This returns a promise, resolvable to array with ids of available messages.
  * Rejected promise may have a string error code from SC.
  */
-export declare type GetMsgIds = (userId: string) => Promise<retrievalApi.listMsgs.Reply>;
+export type GetMsgIds = (userId: string) => Promise<retrievalApi.listMsgs.Reply>;
 /**
  * This returns a promise, resolvable to message meta.
  * Rejected promise may have a string error code from SC.
  */
-export declare type GetMsgMeta = (userId: string, msgId: string) => Promise<retrievalApi.MsgMeta>;
+export type GetMsgMeta = (userId: string, msgId: string) => Promise<retrievalApi.MsgMeta>;
 /**
  * This deletes a message returning a promise, resolvable when message is
  * removed.
  * Rejected promise may have a string error code from SC.
  */
-export declare type DeleteMsg = (userId: string, msgId: string) => Promise<void>;
+export type DeleteMsg = (userId: string, msgId: string) => Promise<void>;
 /**
  * This returns parameter of a message that is still in delivery, identified
  * by given recipient and message id. If message is unknown, or if it has
  * already been delivered, error code is thrown.
  * Rejected promise may have a string error code from SC.
  */
-export declare type IncompleteMsgDeliveryParams = (recipient: string, msgId: string) => Promise<{
+export type IncompleteMsgDeliveryParams = (recipient: string, msgId: string) => Promise<{
     maxMsgLength: number;
     currentMsgLength: number;
 }>;
@@ -67,14 +67,14 @@ export declare type IncompleteMsgDeliveryParams = (recipient: string, msgId: str
  * This returns a promise, resolvable to readable stream of object bytes.
  * Rejected promise may be passing string error code from SC.
  */
-export declare type GetObj = (userId: string, msgId: string, objId: string, header: boolean, segsOffset: number, segsLimit: number | undefined) => Promise<ObjReader>;
-declare type GetParam<T> = (userId: string) => Promise<T>;
-declare type SetParam<T> = (userId: string, param: T) => Promise<boolean>;
-export declare type GetPubKey = GetParam<configApi.p.initPubKey.Certs>;
-export declare type SetPubKey = SetParam<configApi.p.initPubKey.Certs>;
-export declare type GetAnonSenderInvites = GetParam<configApi.p.anonSenderInvites.List>;
-export declare type SetAnonSenderInvites = SetParam<configApi.p.anonSenderInvites.List>;
-export declare type EventsSink = MailEventsSink;
+export type GetObj = (userId: string, msgId: string, objId: string, header: boolean, segsOffset: number, segsLimit: number | undefined) => Promise<ObjReader>;
+type GetParam<T> = (userId: string) => Promise<T>;
+type SetParam<T> = (userId: string, param: T) => Promise<boolean>;
+export type GetPubKey = GetParam<configApi.p.initPubKey.Certs>;
+export type SetPubKey = SetParam<configApi.p.initPubKey.Certs>;
+export type GetAnonSenderInvites = GetParam<configApi.p.anonSenderInvites.List>;
+export type SetAnonSenderInvites = SetParam<configApi.p.anonSenderInvites.List>;
+export type EventsSink = MailEventsSink;
 export interface Factory {
     exists: UserExists;
     allowedMaxMsgSize: AllowedMaxMsgSize;
@@ -92,5 +92,5 @@ export interface Factory {
     setAnonSenderInvites: SetAnonSenderInvites;
     setMailEventsSink(sink: EventsSink): void;
 }
-export declare type StaticSetter<T> = (inbox: Inbox, param: T, setDefault: boolean) => Promise<boolean>;
+export type StaticSetter<T> = (inbox: Inbox, param: T, setDefault: boolean) => Promise<boolean>;
 export declare function makeFactory(rootFolder: string, writeBufferSize?: string | number, readBufferSize?: string | number): Factory;

package/build/asmail/resources/sessions.d.ts

@@ -1,6 +1,6 @@
 import { Request as Req, SessionParams, Factory } from '../../lib-server/resources/sessions';
-export declare type SessionsFactory = Factory<SessionParams>;
-export declare type Request = Req<SessionParams>;
+export type SessionsFactory = Factory<SessionParams>;
+export type Request = Req<SessionParams>;
 /**
  * This returns factory, that works properly in a single process application,
  * clearing up sessions that past given timeout.

package/build/asmail/routes/delivery/sender-authorization.d.ts

@@ -1,6 +1,6 @@
 import { RequestHandler } from 'express';
 import { SignedLoad } from '../../../lib-common/jwkeys';
-export declare type IMidAuthorizer = (rpDomain: string, sessionId: string, userId: string, mailerIdAssertion: SignedLoad, userCert: SignedLoad, provCert: SignedLoad) => Promise<boolean>;
+export type IMidAuthorizer = (rpDomain: string, sessionId: string, userId: string, mailerIdAssertion: SignedLoad, userCert: SignedLoad, provCert: SignedLoad) => Promise<boolean>;
 /**
  * This creates an authorize-sender route handler.
  * @param relyingPartyDomain at which this service operates, as seen by client

package/build/asmail/routes/delivery/start-session.d.ts

@@ -1,7 +1,7 @@
 import { RequestHandler } from 'express';
 import { GenerateSession } from '../../resources/delivery-sessions';
 import { AllowedMaxMsgSize } from '../../resources/recipients';
-export declare type Redirect = (userId: string) => Promise<string>;
+export type Redirect = (userId: string) => Promise<string>;
 /**
  * This creates a start-session route handler.
  * @param allowedMsgSizeFunc is a function returning promises, that may resolve to

package/build/config/letsencrypt.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="node" />
 import { ServerOptions } from "https";
-export declare type CertsUpdateListener = (newOpts: ServerOptions, originalOpts: ServerOptions) => Promise<void>;
+export type CertsUpdateListener = (newOpts: ServerOptions, originalOpts: ServerOptions) => Promise<void>;
 export declare function sslOptsFromConfig(letsencrypt: string | undefined, sslOpts: ServerOptions | undefined, skipReloadOnCertsChange: boolean | undefined): {
     sslOpts: ServerOptions;
     onCertsUpdate?: (listener: CertsUpdateListener) => (() => void);

package/build/config/signup.js

@@ -129,4 +129,5 @@ async function readAllSignupTokens(rootFolder) {
     return { multiUserTokens, singleUserTokens };
 }
 exports.readAllSignupTokens = readAllSignupTokens;
+// XXX external qrencode command can be used to display QR code
 Object.freeze(exports);

package/build/lib-common/byte-streaming/common.d.ts

@@ -1,6 +1,6 @@
-export declare type ByteSource = web3n.ByteSource;
+export type ByteSource = web3n.ByteSource;
 export declare function wrapByteSourceImplementation(src: ByteSource): ByteSource;
-export declare type ByteSink = web3n.ByteSink;
+export type ByteSink = web3n.ByteSink;
 export declare function wrapByteSinkImplementation(sink: ByteSink): ByteSink;
 export declare class BytesFIFOBuffer {
     private queue;

package/build/lib-common/byte-streaming/common.js

@@ -45,17 +45,17 @@ function wrapByteSinkImplementation(sink) {
 }
 exports.wrapByteSinkImplementation = wrapByteSinkImplementation;
 class BytesFIFOBuffer {
-    constructor() {
-        this.queue = [];
-        this.bytesLen = 0;
-        Object.seal(this);
-    }
     get length() {
         return this.bytesLen;
     }
     get queueLength() {
         return this.queue.length;
     }
+    constructor() {
+        this.queue = [];
+        this.bytesLen = 0;
+        Object.seal(this);
+    }
     clear() {
         this.queue = [];
         this.bytesLen = 0;

package/build/lib-common/exceptions/file.d.ts

@@ -1,6 +1,6 @@
 export declare const fileExceptionType = "file";
 export declare const Code: web3n.files.exceptionCode;
-export declare type FileException = web3n.files.FileException;
+export type FileException = web3n.files.FileException;
 export declare function makeFileException(code: string | undefined, path: string, cause?: any): FileException;
 export declare function maskPathInExc(pathPrefixMaskLen: number, exc: any): FileException;
 export declare function ensureCorrectFS(fs: web3n.files.FS, type: web3n.files.FSType, writable: boolean): void;

package/build/lib-common/ipc/generic-ipc.d.ts

@@ -1,12 +1,12 @@
 import { Envelope } from '../service-api/ipc-api';
 export { Envelope, EventEnvelope, EventEndEnvelope, EventException, RequestEnvelope, ReplyEnvelope } from '../service-api/ipc-api';
-export declare type RequestHandler<TReq, TRes> = web3n.ipc.RequestHandler<TReq, TRes>;
-export declare type RequestingClient = web3n.ipc.RequestingClient;
-export declare type RequestServer = web3n.ipc.RequestServer;
-export declare type EventfulServer = web3n.ipc.EventfulServer;
-export declare type SubscribingClient = web3n.ipc.SubscribingClient;
-export declare type Observer<T> = web3n.Observer<T>;
-export declare type RawDuplex<T> = web3n.ipc.RawDuplex<T>;
+export type RequestHandler<TReq, TRes> = web3n.ipc.RequestHandler<TReq, TRes>;
+export type RequestingClient = web3n.ipc.RequestingClient;
+export type RequestServer = web3n.ipc.RequestServer;
+export type EventfulServer = web3n.ipc.EventfulServer;
+export type SubscribingClient = web3n.ipc.SubscribingClient;
+export type Observer<T> = web3n.Observer<T>;
+export type RawDuplex<T> = web3n.ipc.RawDuplex<T>;
 export declare function makeRequestingClient(channel: string | undefined, comm: RawDuplex<Envelope>): RequestingClient;
 export declare function makeRequestServer(channel: string | undefined, comm: RawDuplex<Envelope>): RequestServer;
 export declare function makeEventfulServer(channel: string | undefined, comm: RawDuplex<Envelope>): EventfulServer;

package/build/lib-common/ipc/generic-ipc.js

@@ -586,14 +586,14 @@ function makeSubscribingClient(channel, comm) {
 }
 exports.makeSubscribingClient = makeSubscribingClient;
 class MultiObserverWrap {
+    get done() {
+        return this.isDone;
+    }
     constructor() {
         this.isDone = false;
         this.obs = new Set();
         Object.seal(this);
     }
-    get done() {
-        return this.isDone;
-    }
     add(obs) {
         if (this.isDone) {
             throw new Error(`Cannot add observer, as this source is already done`);
@@ -645,15 +645,15 @@ exports.MultiObserverWrap = MultiObserverWrap;
 Object.freeze(MultiObserverWrap.prototype);
 Object.freeze(MultiObserverWrap);
 class SingleObserverWrap {
+    get done() {
+        return this.isDone;
+    }
     constructor() {
         this.isDone = false;
         this.obs = undefined;
         this.detach = () => this.setDone();
         Object.seal(this);
     }
-    get done() {
-        return this.isDone;
-    }
     set(obs) {
         if (this.isDone) {
             throw new Error(`Cannot add observer, as this source is already done`);

package/build/lib-common/objs-on-disk/file-layout.d.ts

@@ -4,10 +4,10 @@ export interface HeaderChunkInfo {
     len: number;
     fileOfs: number;
 }
-export declare type NotOnDiskFiniteChunk = NewSegsChunk | BaseSegsChunk;
-export declare type OnDiskChunk = NewSegsChunkOnDisk | BaseSegsChunkOnDisk;
-export declare type FiniteSegsChunk = OnDiskChunk | NotOnDiskFiniteChunk;
-export declare type SegsChunk = OnDiskChunk | NotOnDiskFiniteChunk | NewEndlessSegsChunk;
+export type NotOnDiskFiniteChunk = NewSegsChunk | BaseSegsChunk;
+export type OnDiskChunk = NewSegsChunkOnDisk | BaseSegsChunkOnDisk;
+export type FiniteSegsChunk = OnDiskChunk | NotOnDiskFiniteChunk;
+export type SegsChunk = OnDiskChunk | NotOnDiskFiniteChunk | NewEndlessSegsChunk;
 export interface FiniteChunk {
     thisVerOfs: number;
     len: number;

package/build/lib-common/objs-on-disk/utils.d.ts

@@ -14,10 +14,10 @@ export interface ChunkWithSegs {
     len: number;
     segsOfs: number;
 }
-export declare type Chunk = ChunkWithHeader | ChunkWithSegs;
+export type Chunk = ChunkWithHeader | ChunkWithSegs;
 export declare function streamToObjFile(file: ObjVersionFile, content: Chunk[], src: Readable, maxBufferLen: number): Promise<void>;
 export declare function chunksInOrderedStream(len: number, headerLen: undefined | number, segsOfs: number): Chunk[];
-export declare type ObjPipe = (outStream: NodeJS.WritableStream) => Promise<void>;
-export declare type GetObjFile = (objId: string | null, version: number) => Promise<ObjVersionFile>;
+export type ObjPipe = (outStream: NodeJS.WritableStream) => Promise<void>;
+export type GetObjFile = (objId: string | null, version: number) => Promise<ObjVersionFile>;
 export declare function makeObjPipe(file: ObjVersionFile, header: boolean, segsOfs: number, segsLen: number, objId: string | null, getObjFile: GetObjFile): ObjPipe;
 export declare function makeNoBaseObjPipe(file: ObjVersionFile, header: boolean, segsOfs: number, segsLen: number): ObjPipe;

package/build/lib-common/processes.d.ts

@@ -29,7 +29,7 @@ export declare function finalizeAsync<T>(promise: Promise<T>, fin: () => Promise
  * later time. Scheduler needs a not-yet-started activity, as scheduler has
  * control action's start.
  */
-export declare type Action<T> = () => Promise<T>;
+export type Action<T> = () => Promise<T>;
 /**
  * This is a container of processes, labeled by some ids. It allows to track if
  * there is a process already in progress with a given id. And, it allows to

package/build/lib-common/service-api/ipc-api.d.ts

@@ -1,9 +1,9 @@
-export declare type Envelope = web3n.ipc.Envelope;
-export declare type EventEnvelope<T> = web3n.ipc.EventEnvelope<T>;
-export declare type EventEndEnvelope = web3n.ipc.EventEndEnvelope;
-export declare type EventException = web3n.ipc.EventException;
-export declare type RequestEnvelope<T> = web3n.ipc.RequestEnvelope<T>;
-export declare type ReplyEnvelope<T> = web3n.ipc.ReplyEnvelope<T>;
+export type Envelope = web3n.ipc.Envelope;
+export type EventEnvelope<T> = web3n.ipc.EventEnvelope<T>;
+export type EventEndEnvelope = web3n.ipc.EventEndEnvelope;
+export type EventException = web3n.ipc.EventException;
+export type RequestEnvelope<T> = web3n.ipc.RequestEnvelope<T>;
+export type ReplyEnvelope<T> = web3n.ipc.ReplyEnvelope<T>;
 export declare namespace events {
     namespace subscribe {
         const REQ_NAME = "subscribe";

package/build/lib-common/service-api/web-socket-base.d.ts

@@ -16,7 +16,7 @@ export interface EventEnvelope<T> {
     eventChannel: string;
     eventPayload: T;
 }
-export declare type Envelope = RequestEnvelope<any> | ReplyEnvelope<any> | EventEnvelope<any>;
+export type Envelope = RequestEnvelope<any> | ReplyEnvelope<any> | EventEnvelope<any>;
 export declare namespace events {
     const MISSED_EVENTS_CHANNEL = "missed-events";
     const SUBSCRIBE_REQ_NAME = "subscribe";

package/build/lib-server/middleware/error-handler.d.ts

@@ -11,6 +11,6 @@ export interface HttpError extends ErrorWithCause {
  * @param cause
  */
 export declare function makeErr(code: number, msg: string, cause?: any): HttpError;
-export declare type ErrLogger = (err: any, req: Request) => void;
+export type ErrLogger = (err: any, req: Request) => void;
 export declare function makeErrHandler(log?: ErrLogger): ErrorRequestHandler;
 export declare function makeErrLoggerToConsole(srvName: string): ErrLogger;

package/build/lib-server/resources/dns.d.ts

@@ -2,5 +2,5 @@ export declare const SC: {
     RECORDS_MISSING: string;
     DOMAIN_NOT_FOUND: string;
 };
-export declare type ServiceLabel = 'asmail' | 'mailerid' | '3nstorage';
+export type ServiceLabel = 'asmail' | 'mailerid' | '3nstorage';
 export declare function get3NWebRecords(address: string, serviceLabel: ServiceLabel): Promise<string>;

package/build/lib-server/resources/sessions.d.ts

@@ -22,8 +22,8 @@ export interface Request<T> extends express.Request {
 export interface BaseRequest<T> extends http.IncomingMessage {
     session: Session<T>;
 }
-export declare type CheckSession<T> = (req: BaseRequest<T>) => Promise<boolean>;
-export declare type GenerateSession<T> = () => Promise<Session<T>>;
+export type CheckSession<T> = (req: BaseRequest<T>) => Promise<boolean>;
+export type GenerateSession<T> = () => Promise<Session<T>>;
 export interface Factory<T> {
     generate: GenerateSession<T>;
     ensureAuthorizedSession(): express.RequestHandler;

package/build/lib-server/resources/user-files.d.ts

@@ -15,7 +15,7 @@ export declare abstract class UserFiles {
     getParam<T>(paramFileName: string): Promise<T>;
     setParam<T>(paramFileName: string, param: T): Promise<void>;
 }
-export declare type ObjPipe = (outStream: NodeJS.WritableStream) => Promise<void>;
+export type ObjPipe = (outStream: NodeJS.WritableStream) => Promise<void>;
 export interface ObjReader {
     len: number;
     /**

package/build/lib-server/routes/pub-key-login/start-exchange.d.ts

@@ -10,7 +10,7 @@ export interface SessionParams extends UserParams {
     sessionKey: Uint8Array;
     serverVerificationBytes: Uint8Array;
 }
-export declare type Request = SessReq<SessionParams>;
+export type Request = SessReq<SessionParams>;
 export interface UserPKeyAndKeyGenParams {
     pkey: Uint8Array;
     params?: any;
@@ -22,7 +22,7 @@ export interface UserPKeyAndKeyGenParams {
  * Else, if incoming id is not ok, undefined is returned.
  * @params initUserId is a an incoming string, that should be an id
  */
-export declare type CheckAndTransformUserId = (initUserId: string) => string | undefined;
+export type CheckAndTransformUserId = (initUserId: string) => string | undefined;
 /**
  * This returns a promise of user public key and related parameters.
  * If user is not found, undefined is returned.
@@ -30,8 +30,8 @@ export declare type CheckAndTransformUserId = (initUserId: string) => string | u
  * @param kid is a key id that should be used at login. Undefined value
  * indicates that default key should be used.
  */
-export declare type GetUserPKeyAndKeyGenParams = (userId: string, kid: string | undefined) => Promise<UserPKeyAndKeyGenParams | undefined>;
-export declare type ComputeDHSharedKey = (userKey: Uint8Array) => {
+export type GetUserPKeyAndKeyGenParams = (userId: string, kid: string | undefined) => Promise<UserPKeyAndKeyGenParams | undefined>;
+export type ComputeDHSharedKey = (userKey: Uint8Array) => {
     dhsharedKey: Uint8Array;
     serverPubKey: Uint8Array;
 };

package/build/lib-server/routes/sessions/mid-auth.d.ts

@@ -6,7 +6,7 @@ import { SignedLoad } from '../../../lib-common/jwkeys';
  * Autherization failure may be due to either, invalid MailerId credentials, or
  * due to other service's restriction(s) on users.
  */
-export declare type MidAuthorizer = (rpDomain: string, sessionId: string, userId: string, mailerIdAssertion: SignedLoad, userCert: SignedLoad, provCert: SignedLoad) => Promise<boolean>;
+export type MidAuthorizer = (rpDomain: string, sessionId: string, userId: string, mailerIdAssertion: SignedLoad, userCert: SignedLoad, provCert: SignedLoad) => Promise<boolean>;
 /**
  * @param relyingPartyDomain is a domain of service, for which this assertion
  * check is done. Usually, it is this site's domain, which we set explicitly.

package/build/lib-server/routes/sessions/start.d.ts

@@ -1,6 +1,6 @@
 import { RequestHandler } from 'express';
 import { GenerateSession, Request as SessionReq, SessionParams } from '../../resources/sessions';
-export declare type Request = SessionReq<SessionParams>;
+export type Request = SessionReq<SessionParams>;
 /**
  * This function checks overall shape of a given user id, possibly
  * transforming it to some canonical form, used by the service.
@@ -8,9 +8,9 @@ export declare type Request = SessionReq<SessionParams>;
  * Else, if incoming id is not ok, undefined is returned.
  * @params initUserId is a an incoming string, that should be an id
  */
-export declare type CheckAndTransformUserId = (initUserId: string) => string | undefined;
-export declare type UserExists = (userId: string) => Promise<boolean>;
-export declare type Redirect = (userId: string) => Promise<string>;
+export type CheckAndTransformUserId = (initUserId: string) => string | undefined;
+export type UserExists = (userId: string) => Promise<boolean>;
+export type Redirect = (userId: string) => Promise<string>;
 /**
  * This returns route handler that creates sessions for a given userId, with
  * potential redirect for a named user.

package/build/lib-server/web-sockets/app.d.ts

@@ -5,7 +5,7 @@ import * as https from 'https';
 import * as express from 'express';
 import * as WebSocket from 'ws';
 import { CheckSession, SessionParams } from '../resources/sessions';
-export declare type HttpServer = http.Server | https.Server;
+export type HttpServer = http.Server | https.Server;
 export declare class UserSockets {
     checkSession: CheckSession<SessionParams>;
     /**

package/build/lib-server/web-sockets/app.js

@@ -209,6 +209,12 @@ class PingSender {
 Object.freeze(PingSender.prototype);
 Object.freeze(PingSender);
 class AppWithWSs {
+    get sockServer() {
+        if (!this.socks) {
+            this.socks = new UserSocketsServer();
+        }
+        return this.socks;
+    }
     constructor(httpApp) {
         this.server = undefined;
         this.closingProc = undefined;
@@ -216,12 +222,6 @@ class AppWithWSs {
         this.http = (httpApp ? httpApp : express());
         Object.seal(this);
     }
-    get sockServer() {
-        if (!this.socks) {
-            this.socks = new UserSocketsServer();
-        }
-        return this.socks;
-    }
     addWS(path, socks) {
         if (typeof path === 'string') {
             socks.path = ensureSlashesOnFront(path);

package/build/lib-server/web-sockets/server-events.d.ts

@@ -1,6 +1,6 @@
 import * as WebSocket from 'ws';
 import { SocketIPCs } from './app';
-export declare type EventsSink<T> = (userId: string, channel: string, event: T) => void;
+export type EventsSink<T> = (userId: string, channel: string, event: T) => void;
 export declare class ServerEvents<T> implements SocketIPCs {
     ipcChannel: string | undefined;
     private eventChannels;

package/build/lib.d.ts

@@ -1,6 +1,5 @@
 export { AppWithWSs } from './lib-server/web-sockets/app';
 export { Configurations, servicesApp, adminApp } from './services';
-export { getConfsFromEnv, getBindParamsFromEnv } from './config/from-env';
 export { addSingleUserSignup } from './config/signup';
 export import errors = require('./lib-server/middleware/error-handler');
 export * as mock from './mock/run-in-proc';

package/build/lib.js

@@ -16,15 +16,12 @@
  this program. If not, see <http://www.gnu.org/licenses/>.
 */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.mock = exports.addSingleUserSignup = exports.getBindParamsFromEnv = exports.getConfsFromEnv = exports.adminApp = exports.servicesApp = exports.AppWithWSs = void 0;
+exports.mock = exports.addSingleUserSignup = exports.adminApp = exports.servicesApp = exports.AppWithWSs = void 0;
 var app_1 = require("./lib-server/web-sockets/app");
 Object.defineProperty(exports, "AppWithWSs", { enumerable: true, get: function () { return app_1.AppWithWSs; } });
 var services_1 = require("./services");
 Object.defineProperty(exports, "servicesApp", { enumerable: true, get: function () { return services_1.servicesApp; } });
 Object.defineProperty(exports, "adminApp", { enumerable: true, get: function () { return services_1.adminApp; } });
-var from_env_1 = require("./config/from-env");
-Object.defineProperty(exports, "getConfsFromEnv", { enumerable: true, get: function () { return from_env_1.getConfsFromEnv; } });
-Object.defineProperty(exports, "getBindParamsFromEnv", { enumerable: true, get: function () { return from_env_1.getBindParamsFromEnv; } });
 var signup_1 = require("./config/signup");
 Object.defineProperty(exports, "addSingleUserSignup", { enumerable: true, get: function () { return signup_1.addSingleUserSignup; } });
 exports.errors = require("./lib-server/middleware/error-handler");

package/build/mailerId/resources/certifier.d.ts

@@ -6,7 +6,7 @@ export interface RootCerts {
     current: SignedLoad;
     previous: SignedLoad[];
 }
-export declare type ICertify = (userPKey: JsonKey, address: string, validFor?: number) => {
+export type ICertify = (userPKey: JsonKey, address: string, validFor?: number) => {
     userCert: SignedLoad;
     provCert: SignedLoad;
 };

package/build/mailerId/resources/sessions.d.ts

@@ -1,7 +1,7 @@
 import { Factory } from '../../lib-server/resources/sessions';
 import { SessionParams } from '../../lib-server/routes/pub-key-login/start-exchange';
 export { Request } from '../../lib-server/routes/pub-key-login/start-exchange';
-export declare type SessionsFactory = Factory<SessionParams>;
+export type SessionsFactory = Factory<SessionParams>;
 /**
  * This returns factory, that works properly in a single process application,
  * clearing up sessions that past given timeout.

package/build/mock/node-child-ipc.d.ts

@@ -2,7 +2,7 @@
 import * as cProcs from 'child_process';
 import { RequestServer, RequestingClient } from '../lib-common/ipc/generic-ipc';
 export { RequestEnvelope, RequestHandler } from '../lib-common/ipc/generic-ipc';
-export declare type IPCToChild = RequestingClient;
-export declare type IPCToParent = RequestServer;
+export type IPCToChild = RequestingClient;
+export type IPCToParent = RequestServer;
 export declare function commToChild(channel: string, child: cProcs.ChildProcess): IPCToChild;
 export declare function commToParent(channel: string): IPCToParent;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "spec-3nweb-server",
-  "version": "1.7.0",
+  "version": "1.7.1",
   "description": "3NWeb spec server.",
   "main": "build/lib.js",
   "types": "build/lib.d.ts",
@@ -10,7 +10,7 @@
     "clear-for-packing": "npm prune --production && bash -c \"rm -rf build/mock build/tests 'node_modules/ecma-nacl/c sources'\"",
     "clear-for-packing-mock": "npm prune --production && bash -c \"rm -rf build/tests 'node_modules/ecma-nacl/c sources'\"",
     "pack": "pkg --config package.json build/main.js",
-    "pack-deb": "npm run pack && bash packing/deb/create-bin.sh",
+    "pack-deb": "npm run pack && bash packing/create-deb.sh",
     "postinstall": "node -e \"try{require('./postinstall')}catch(e){}\""
   },
   "repository": {
@@ -34,7 +34,7 @@
     "command-line-args": "^5.2.1",
     "command-line-usage": "^7.0.1",
     "ecma-nacl": "^2.4.0",
-    "express": "^4.18.0",
+    "express": "^4.19.2",
     "js-yaml": "^4.1.0",
     "prompts": "^2.4.2",
     "punycode": "^2.1.1",

package/build/config/from-env.d.ts

@@ -1,9 +0,0 @@
-/// <reference types="node" />
-import { Configurations } from "../services";
-import { ServerOptions } from "https";
-export declare function getConfsFromEnv(): Configurations;
-export declare function getBindParamsFromEnv(): {
-    address?: string;
-    port: number;
-    sslOpts?: ServerOptions;
-};

package/build/config/from-env.js

@@ -1,117 +0,0 @@
-"use strict";
-/*
- Copyright (C) 2019 - 2020 3NSoft Inc.
- 
- This program is free software: you can redistribute it and/or modify it under
- the terms of the GNU General Public License as published by the Free Software
- Foundation, either version 3 of the License, or (at your option) any later
- version.
- 
- This program is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- See the GNU General Public License for more details.
- 
- You should have received a copy of the GNU General Public License along with
- this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getBindParamsFromEnv = exports.getConfsFromEnv = void 0;
-const async_fs_node_1 = require("../lib-common/async-fs-node");
-const path_1 = require("path");
-const fs_1 = require("fs");
-const DOMAIN_VAR = 'W3N_DOMAIN';
-const DATA_DIR_VAR = 'W3N_DATA_DIR';
-const NO_TOKENS_FILE = 'NO_TOKENS_FILE';
-const CERTS_FILE_VAR = 'W3N_MID_CERTS_FILE';
-const ADDRESS_VAR = 'W3N_SERICE_ADDRESS';
-const PORT_VAR = 'W3N_SERICE_PORT';
-const TLS_KEY_VAR = 'W3N_SERICE_TLS_KEY';
-const TLS_CERT_VAR = 'W3N_SERICE_TLS_CERT';
-const TLS_PFX_VAR = 'W3N_SERICE_TLS_PFX';
-const DEFAULT_PORT = 8080;
-function makeConf(domain, rootFolder, midCertsFile, noTokenFile) {
-    return {
-        enabledServices: {
-            asmail: true,
-            storage: true,
-            mailerId: true
-        },
-        rootFolder,
-        domain,
-        mailerId: {
-            certs: midCertsFile
-        },
-        signup: {
-            noTokenFile
-        }
-    };
-}
-function getConfsFromEnv() {
-    const domain = process.env[DOMAIN_VAR];
-    if (!domain) {
-        throw new Error(`Environment variable ${DOMAIN_VAR} is not set with domain name, for which 3NWeb processes are served.`);
-    }
-    let dataDir = process.env[DATA_DIR_VAR];
-    if (!dataDir) {
-        dataDir = '/var/local/3nweb';
-    }
-    // Make data folders
-    ensureFolderPresence(dataDir, true);
-    dataDir = (0, fs_1.realpathSync)(dataDir);
-    let midCerts = process.env[CERTS_FILE_VAR];
-    if (!midCerts) {
-        midCerts = (0, path_1.join)(dataDir, 'mid-certs.json');
-    }
-    const noTokenFile = process.env[NO_TOKENS_FILE];
-    return makeConf(domain, dataDir, midCerts, noTokenFile);
-}
-exports.getConfsFromEnv = getConfsFromEnv;
-function ensureFolderPresence(path, doLog) {
-    if ((0, async_fs_node_1.existsFolderSync)(path)) {
-        if (doLog) {
-            console.log(`Using existing data folder ${path}`);
-        }
-    }
-    else {
-        (0, fs_1.mkdirSync)(path);
-        if (doLog) {
-            console.log(`Created ${(0, fs_1.realpathSync)(path)}`);
-        }
-    }
-}
-function getBindParamsFromEnv() {
-    const address = process.env[ADDRESS_VAR];
-    const portStr = process.env[PORT_VAR];
-    let port;
-    if (portStr) {
-        port = Number.parseInt(portStr);
-        if (!Number.isInteger(port)) {
-            port = DEFAULT_PORT;
-        }
-    }
-    else {
-        port = DEFAULT_PORT;
-    }
-    const sslOpts = getTLSParamsFromEnv();
-    return { address, port, sslOpts };
-}
-exports.getBindParamsFromEnv = getBindParamsFromEnv;
-function getTLSParamsFromEnv() {
-    const pfx = process.env[TLS_PFX_VAR];
-    if (pfx) {
-        return { pfx };
-    }
-    const cert = process.env[TLS_CERT_VAR];
-    const key = process.env[TLS_KEY_VAR];
-    if (cert && key) {
-        return { cert, key };
-    }
-    else if (!cert && !key) {
-        return;
-    }
-    else {
-        throw new Error(`Both ${TLS_CERT_VAR} and ${TLS_KEY_VAR} environment parameters should be present, but one is missing.`);
-    }
-}
-Object.freeze(exports);

package/build/run.d.ts

@@ -1 +0,0 @@
-export {};

package/build/run.js

@@ -1,45 +0,0 @@
-"use strict";
-/*
- Copyright (C) 2015 - 2019 3NSoft Inc.
- 
- This program is free software: you can redistribute it and/or modify it under
- the terms of the GNU General Public License as published by the Free Software
- Foundation, either version 3 of the License, or (at your option) any later
- version.
- 
- This program is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- See the GNU General Public License for more details.
- 
- You should have received a copy of the GNU General Public License along with
- this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-Object.defineProperty(exports, "__esModule", { value: true });
-const lib_1 = require("./lib");
-(async () => {
-    let app = undefined;
-    async function stopProcess() {
-        if (!app) {
-            return;
-        }
-        app.stop().then(err => console.log(err));
-        app = undefined;
-    }
-    try {
-        const conf = (0, lib_1.getConfsFromEnv)();
-        app = new lib_1.AppWithWSs();
-        app.use((0, lib_1.servicesApp)(conf));
-        app.use((0, lib_1.adminApp)(conf));
-        const { address, port, sslOpts } = (0, lib_1.getBindParamsFromEnv)();
-        await app.start(sslOpts, port, address);
-        console.log(`Started 3NWeb server at address ${address}, port ${port}, ${sslOpts ? 'via TLS' : 'without TLS, and requiring TLS reverse proxy infront.'}`);
-        process.on('SIGINT', stopProcess);
-        process.on('SIGTERM', stopProcess);
-    }
-    catch (err) {
-        stopProcess();
-        console.error(err);
-        process.exit(-500);
-    }
-})();