spec-3nweb-server 1.7.13 → 1.8.0

package/build/3nstorage/3nstorage-app.js

@@ -1,6 +1,6 @@
 "use strict";
 /*
- Copyright (C) 2015 - 2016, 2020 3NSoft Inc.
+ Copyright (C) 2015 - 2016, 2020, 2025 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
@@ -35,8 +35,8 @@ function setupStaticStorageEntryRoute(app) {
             path = path + '/';
         }
         const json = {
-            "owner": path + PATHS.owner.substring(1),
-            "shared": path + PATHS.shared.substring(1)
+            owner: path + PATHS.owner.substring(1),
+            shared: path + PATHS.shared.substring(1)
         };
         // the following implicitly sets content type application/json
         res.status(200).json(json);

package/build/asmail/asmail-app.js

@@ -38,9 +38,9 @@ function setupStaticEntryRoute(app) {
             path = path + '/';
         }
         const json = {
-            "delivery": path + PATHS.delivery.substring(1),
-            "retrieval": path + PATHS.retrieval.substring(1),
-            "config": path + PATHS.config.substring(1)
+            delivery: path + PATHS.delivery.substring(1),
+            retrieval: path + PATHS.retrieval.substring(1),
+            config: path + PATHS.config.substring(1)
         };
         // the following implicitly sets content type application/json
         res.status(200).json(json);

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

@@ -75,9 +75,11 @@ export declare class Inbox extends UserFiles<InboxParams> {
     completeMsgDelivery(msgId: string): Promise<void>;
     private areAllMsgObjsComplete;
     /**
+     * @param fromTS
+     * @param toTS
      * @return a promise, resolvable to a list of available message ids.
      */
-    getMsgIds(): Promise<retrievalApi.listMsgs.Reply>;
+    getMsgIds(fromTS: number | undefined, toTS: number | undefined): Promise<retrievalApi.listMsgs.Reply>;
     /**
      * This method returns parameters of an incomplete message, identified
      * by a given id.

package/build/asmail/resources/inbox.js

@@ -237,10 +237,31 @@ class Inbox extends user_files_1.UserFiles {
         return true;
     }
     /**
+     * @param fromTS
+     * @param toTS
      * @return a promise, resolvable to a list of available message ids.
      */
-    getMsgIds() {
-        return fs.readdir(this.metas.readyMsgsFolder);
+    async getMsgIds(fromTS, toTS) {
+        // XXX this isn't efficient, and needs sqlite-powered index
+        const lst = await fs.readdir(this.metas.readyMsgsFolder);
+        if ((fromTS === undefined) && (toTS === undefined)) {
+            return lst;
+        }
+        const filteredLst = [];
+        for (const msgId of lst) {
+            try {
+                const { deliveryStart } = await this.metas.get(msgId, true);
+                if (fromTS && (deliveryStart < fromTS)) {
+                    continue;
+                }
+                if (toTS && (toTS < deliveryStart)) {
+                    continue;
+                }
+                filteredLst.push(msgId);
+            }
+            catch (exc) { }
+        }
+        return filteredLst;
     }
     /**
      * This method returns parameters of an incomplete message, identified

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

@@ -79,7 +79,7 @@ export interface MsgRetrieval {
      * This returns a promise, resolvable to array with ids of available
      * messages. Rejected promise may have a string error code from SC.
      */
-    getMsgIds: (userId: string) => Promise<retrievalApi.listMsgs.Reply>;
+    getMsgIds: (userId: string, fromTS: number | undefined, toTS: number | undefined) => Promise<retrievalApi.listMsgs.Reply>;
     /**
      * This returns a promise, resolvable to message meta.
      * Rejected promise may have a string error code from SC.

package/build/asmail/resources/recipients.js

@@ -284,9 +284,9 @@ function makeRecipients(rootFolder, writeBufferSize, readBufferSize) {
     Object.freeze(delivery);
     const retrieval = {
         exists: config.exists,
-        getMsgIds: async (userId) => {
+        getMsgIds: async (userId, fromTS, toTS) => {
             const inbox = await getInbox(userId);
-            return inbox.getMsgIds();
+            return inbox.getMsgIds(fromTS, toTS);
         },
         getMsgMeta: async (userId, msgId) => {
             const inbox = await getInbox(userId);

package/build/asmail/retrieval.js

@@ -46,11 +46,11 @@ function setWSPart(app, sessions, recipients) {
 function setHttpPart(app, domain, sessions, recipients, midAuthorizer) {
     app.disable('etag');
     // Login
-    (0, mid_access_1.addMailerIdLoginRoutes)(app, domain, '/' + api.midLogin.URL_PART, sessions, recipients.exists, midAuthorizer);
+    (0, mid_access_1.addMailerIdLoginRoutes)(app, domain, '/' + api.midLogin.MID_URL_PART, sessions, recipients.exists, midAuthorizer);
     // *** Require authorized session for everything below ***
     app.use(sessions.ensureAuthorizedSession());
     app.post('/' + api.closeSession.URL_END, (0, body_parsers_1.emptyBody)(), (0, close_1.closeSession)());
-    app.get('/' + api.listMsgs.URL_END, (0, list_messages_1.listMsgIds)(recipients.getMsgIds));
+    app.get('/' + api.listMsgs.EXPRESS_URL_END, (0, list_messages_1.listMsgIds)(recipients.getMsgIds));
     app.get('/' + api.msgMetadata.EXPRESS_URL_END, (0, get_message_meta_1.getMsgMeta)(recipients.getMsgMeta));
     app.delete('/' + api.rmMsg.EXPRESS_URL_END, (0, remove_message_1.deleteMsg)(recipients.deleteMsg));
     app.get('/' + api.msgObj.EXPRESS_URL_END, (0, get_message_obj_1.getMsgObj)(recipients.getObj));

package/build/asmail/routes/retrieval/list-messages.js

@@ -22,8 +22,14 @@ const retrieval_1 = require("../../../lib-common/service-api/asmail/retrieval");
 function listMsgIds(listMsgIdsFunc) {
     return async (req, res, next) => {
         const userId = req.session.params.userId;
+        const opts = extractQueryOptions(req);
+        if (!opts) {
+            res.status(retrieval_1.ERR_SC.malformed).send("Bad query parameters");
+            return;
+        }
         try {
-            const msgIds = await listMsgIdsFunc(userId);
+            const { from, to } = opts;
+            const msgIds = await listMsgIdsFunc(userId, from, to);
             res.status(retrieval_1.listMsgs.SC.ok).json(msgIds);
         }
         catch (err) {
@@ -41,4 +47,16 @@ function listMsgIds(listMsgIdsFunc) {
     };
 }
 exports.listMsgIds = listMsgIds;
+function extractQueryOptions(req) {
+    const query = req.query;
+    const from = (query.from ? parseInt(query.from) : undefined);
+    if ((from !== undefined) && (isNaN(from) || (from <= 0))) {
+        return;
+    }
+    const to = (query.to ? parseInt(query.to) : undefined);
+    if ((to !== undefined) && (isNaN(to) || (to <= 0))) {
+        return;
+    }
+    return { from, to };
+}
 Object.freeze(exports);

package/build/{config/cli → cli}/index.js

@@ -17,7 +17,7 @@
 */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseProcessArgv = void 0;
-const default_confs_1 = require("../default-confs");
+const default_confs_1 = require("../config/default-confs");
 const run_cmd_1 = require("./run-cmd");
 const show_sample_config_1 = require("./show-sample-config");
 const signup_cmd_1 = require("./signup-cmd");

package/build/config/letsencrypt.js

@@ -1,6 +1,6 @@
 "use strict";
 /*
- Copyright (C) 2023 3NSoft Inc.
+ Copyright (C) 2023, 2025 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
@@ -19,13 +19,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.sslOptsFromConfig = void 0;
 const fs_1 = require("fs");
 const path_1 = require("path");
+const LETSENCRYPT_CERT_FILE = 'fullchain.pem';
+const LETSENCRYPT_KEY_FILE = 'privkey.pem';
 function sslOptsFromConfig(letsencrypt, sslOpts, skipReloadOnCertsChange) {
     if (!sslOpts) {
         sslOpts = {};
     }
     if (letsencrypt) {
-        sslOpts.cert = (0, fs_1.readFileSync)((0, path_1.join)(letsencrypt, 'fullchain.pem'));
-        sslOpts.key = (0, fs_1.readFileSync)((0, path_1.join)(letsencrypt, 'privkey.pem'));
+        sslOpts.cert = (0, fs_1.readFileSync)((0, path_1.join)(letsencrypt, LETSENCRYPT_CERT_FILE));
+        sslOpts.key = (0, fs_1.readFileSync)((0, path_1.join)(letsencrypt, LETSENCRYPT_KEY_FILE));
         if (skipReloadOnCertsChange) {
             return { sslOpts };
         }

package/build/lib-common/service-api/3nstorage/root-route.d.ts

@@ -0,0 +1,5 @@
+export interface StorageRootRoute {
+    owner?: string;
+    shared?: string;
+    config?: string;
+}

package/build/lib-common/service-api/3nstorage/root-route.js

@@ -0,0 +1,18 @@
+"use strict";
+/*
+ Copyright (C) 2025 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 });

package/build/lib-common/service-api/asmail/retrieval.d.ts

@@ -12,13 +12,20 @@ export declare const ERR_SC: {
     server: number;
 };
 export declare namespace midLogin {
-    const URL_PART = "login/mailerid/";
+    const MID_URL_PART = "login/mailerid/";
+    const START_URL_END: string;
+    const AUTH_URL_END: string;
 }
 export declare namespace closeSession {
     const URL_END = "close-session";
 }
+export interface ListMsgsOpts {
+    from?: number;
+    to?: number;
+}
 export declare namespace listMsgs {
-    const URL_END = "msg/ids";
+    const EXPRESS_URL_END = "msg/ids";
+    function genUrlEnd(opts?: ListMsgsOpts): string;
     interface Reply extends Array<string> {
     }
     const SC: {
@@ -35,7 +42,7 @@ export declare namespace rmMsg {
 }
 export interface ObjSize {
     header: number;
-    segments: number;
+    segments: number | undefined;
 }
 export interface ObjStatus {
     completed?: boolean;

package/build/lib-common/service-api/asmail/retrieval.js

@@ -1,6 +1,6 @@
 "use strict";
 /*
- Copyright (C) 2015, 2017 3NSoft Inc.
+ Copyright (C) 2015, 2017, 2019, 2025 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
@@ -13,8 +13,7 @@
  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/>.
-*/
+ this program. If not, see <http://www.gnu.org/licenses/>. */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.msgMainObjRecieved = exports.msgRecievedCompletely = exports.wsEventChannel = exports.msgObj = exports.sanitizedMeta = exports.msgMetadata = exports.rmMsg = exports.listMsgs = exports.closeSession = exports.midLogin = exports.ERR_SC = exports.HTTP_HEADER = exports.BIN_TYPE = void 0;
 /**
@@ -38,7 +37,9 @@ exports.ERR_SC = {
 Object.freeze(exports.ERR_SC);
 var midLogin;
 (function (midLogin) {
-    midLogin.URL_PART = 'login/mailerid/';
+    midLogin.MID_URL_PART = 'login/mailerid/';
+    midLogin.START_URL_END = midLogin.MID_URL_PART + midApi.startSession.URL_END;
+    midLogin.AUTH_URL_END = midLogin.MID_URL_PART + midApi.authSession.URL_END;
 })(midLogin = exports.midLogin || (exports.midLogin = {}));
 Object.freeze(midLogin);
 var closeSession;
@@ -48,7 +49,12 @@ var closeSession;
 Object.freeze(closeSession);
 var listMsgs;
 (function (listMsgs) {
-    listMsgs.URL_END = 'msg/ids';
+    listMsgs.EXPRESS_URL_END = 'msg/ids';
+    function genUrlEnd(opts) {
+        let optStr = (opts ? '?' + (0, querystring_1.stringify)(opts) : '');
+        return `msg/ids${optStr}`;
+    }
+    listMsgs.genUrlEnd = genUrlEnd;
     listMsgs.SC = {
         ok: 200,
     };
@@ -144,4 +150,7 @@ var msgMainObjRecieved;
     msgMainObjRecieved.EVENT_NAME = 'msg-main-obj-received';
 })(msgMainObjRecieved = exports.msgMainObjRecieved || (exports.msgMainObjRecieved = {}));
 Object.freeze(msgMainObjRecieved);
+// XXX add event about message removal
+//   it is useful in multi-device case, pass implicit implicit signal that will
+//   have context-specific meaning.
 Object.freeze(exports);

package/build/lib-common/service-api/asmail/root-route.d.ts

@@ -0,0 +1,5 @@
+export interface ASMailRootRoute {
+    delivery?: string;
+    retrieval?: string;
+    config?: string;
+}

package/build/lib-common/service-api/asmail/root-route.js

@@ -0,0 +1,18 @@
+"use strict";
+/*
+ Copyright (C) 2025 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 });

package/build/lib-common/service-api/mailer-id/root-route.d.ts

@@ -0,0 +1,6 @@
+import { SignedLoad } from "../../jwkeys";
+export interface MailerIdRootRoute {
+    "current-cert": SignedLoad;
+    "previous-certs": SignedLoad[];
+    provisioning: string;
+}

package/build/lib-common/service-api/mailer-id/root-route.js

@@ -0,0 +1,18 @@
+"use strict";
+/*
+ Copyright (C) 2025 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 });

package/build/lib-server/resources/mailerid-authorizer.d.ts

@@ -1,2 +1,7 @@
+import { SignedLoad } from '../../lib-common/jwkeys';
 import { MidAuthorizer } from '../routes/sessions/mid-auth';
-export declare function validator(): MidAuthorizer;
+export declare function validator(ownMidService: OwnMidService | undefined): MidAuthorizer;
+export interface OwnMidService {
+    domain: string;
+    getRoot: () => SignedLoad;
+}

package/build/lib-server/resources/mailerid-authorizer.js

@@ -1,6 +1,6 @@
 "use strict";
 /*
- Copyright (C) 2015 - 2016, 2019 3NSoft Inc.
+ Copyright (C) 2015 - 2016, 2019, 2025 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
@@ -62,11 +62,11 @@ function getRootCert(serviceURL) {
 }
 // TODO need to add caching of certs using domain->(kid->cert)
 //		(this will speed things up)
-function validator() {
-    return (rpDomain, sessionId, userId, assertion, userCert, provCert) => validate(rpDomain, sessionId, userId, assertion, userCert, provCert);
+function validator(ownMidService) {
+    return (rpDomain, sessionId, userId, assertion, userCert, provCert) => validate(rpDomain, sessionId, userId, assertion, userCert, provCert, ownMidService);
 }
 exports.validator = validator;
-async function validate(rpDomain, sessionId, userId, assertion, userCert, provCert) {
+async function validate(rpDomain, sessionId, userId, assertion, userCert, provCert, ownMidService) {
     const validAt = Date.now() / 1000;
     try {
         // check that certificate is for the user
@@ -83,7 +83,8 @@ async function validate(rpDomain, sessionId, userId, assertion, userCert, provCe
             return false;
         }
         // get root certificate and check the whole chain
-        const rootCert = await getRootCert(serviceURL);
+        const rootCert = ((ownMidService && (issuer === ownMidService.domain)) ?
+            ownMidService.getRoot() : await getRootCert(serviceURL));
         const assertInfo = mid.relyingParty.verifyAssertion(assertion, { user: userCert, prov: provCert, root: rootCert }, issuer, validAt);
         if ((assertInfo.relyingPartyDomain === rpDomain)
             && (assertInfo.sessionId === sessionId)) {

package/build/lib-server/routes/sessions/mid-auth.js

@@ -36,9 +36,9 @@ function midLogin(relyingPartyDomain, midAuthorizingFunc) {
         }
         const rb = req.body;
         const sessionId = req.session.id;
-        if (!(0, jwkeys_1.isLikeSignedMailerIdAssertion)(rb.assertion) ||
-            !(0, jwkeys_1.isLikeSignedKeyCert)(rb.userCert) ||
-            !(0, jwkeys_1.isLikeSignedKeyCert)(rb.provCert)) {
+        if (!(0, jwkeys_1.isLikeSignedMailerIdAssertion)(rb.assertion)
+            || !(0, jwkeys_1.isLikeSignedKeyCert)(rb.userCert)
+            || !(0, jwkeys_1.isLikeSignedKeyCert)(rb.provCert)) {
             res.sendStatus(login_1.ERR_SC.malformed);
             req.session.close();
             return;

package/build/mailerId/mailerId-app.d.ts

@@ -4,4 +4,8 @@
  */
 import * as express from 'express';
 import { ErrLogger } from '../lib-server/middleware/error-handler';
-export declare function makeMailerIdApp(rootFolder: string, domain: string, certFile: string, errLogger?: ErrLogger): express.Express;
+import { OwnMidService } from '../lib-server/resources/mailerid-authorizer';
+export declare function makeMailerIdApp(rootFolder: string, domain: string, certFile: string, errLogger?: ErrLogger): {
+    app: express.Express;
+    ownService: OwnMidService;
+};

package/build/mailerId/mailerId-app.js

@@ -1,6 +1,6 @@
 "use strict";
 /*
- Copyright (C) 2015 - 2016, 2020, 2024 3NSoft Inc.
+ Copyright (C) 2015 - 2016, 2020, 2024 - 2025 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
@@ -59,12 +59,18 @@ function makeMailerIdApp(rootFolder, domain, certFile, errLogger) {
         const json = {
             "current-cert": certifier.getRootCert(),
             "previous-certs": certifier.getPrevCerts(),
-            "provisioning": path + PROVISIONING_PATH.substring(1)
+            provisioning: path + PROVISIONING_PATH.substring(1)
         };
         res.status(200).json(json); // content type application/json
     });
     app.use((0, error_handler_1.makeErrHandler)(errLogger));
-    return app;
+    return {
+        app,
+        ownService: {
+            domain,
+            getRoot: () => certifier.getRootCert()
+        }
+    };
 }
 exports.makeMailerIdApp = makeMailerIdApp;
 Object.freeze(exports);

package/build/main.js

@@ -17,7 +17,7 @@
  this program. If not, see <http://www.gnu.org/licenses/>.
 */
 Object.defineProperty(exports, "__esModule", { value: true });
-const cli_1 = require("./config/cli");
+const cli_1 = require("./cli");
 const from_yaml_1 = require("./config/from-yaml");
 const letsencrypt_1 = require("./config/letsencrypt");
 const lib_1 = require("./lib");

package/build/services.d.ts

@@ -7,6 +7,8 @@ export interface Configurations {
         asmail?: boolean;
         storage?: boolean;
         mailerId?: boolean;
+    };
+    auxiliaryServices?: {
         locker?: boolean;
     };
     servicesConnect?: {

package/build/services.js

@@ -1,6 +1,6 @@
 "use strict";
 /*
- Copyright (C) 2015 - 2017, 2020, 2024 3NSoft Inc.
+ Copyright (C) 2015 - 2017, 2020, 2024 - 2025 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
@@ -26,16 +26,22 @@ const signup_app_1 = require("./signup/signup-app");
 const error_handler_1 = require("./lib-server/middleware/error-handler");
 const locker_app_1 = require("./locker/locker-app");
 function servicesApp(conf, errLogger, logSetup) {
+    var _a;
     if (!conf.enabledServices || (typeof conf.enabledServices !== 'object')) {
         throw new Error('Missing enabled-services sections in confs.');
     }
     const app = new app_1.AppWithWSs();
-    const midAuthorizer = (0, mailerid_authorizer_1.validator)(); // share, allowing for caching of certs
+    let midAuthorizer; // share, allowing for caching of certs
     if (conf.enabledServices.mailerId) {
-        app.http.use('/mailerid', (0, mailerId_app_1.makeMailerIdApp)(conf.rootFolder, conf.domain, conf.mailerId.certs, (errLogger === 'console') ? (0, error_handler_1.makeErrLoggerToConsole)('MailerId') : errLogger));
+        const { app: midApp, ownService } = (0, mailerId_app_1.makeMailerIdApp)(conf.rootFolder, conf.domain, conf.mailerId.certs, (errLogger === 'console') ? (0, error_handler_1.makeErrLoggerToConsole)('MailerId') : errLogger);
+        app.http.use('/mailerid', midApp);
         if (logSetup === 'console') {
             console.log(`Enabled MailerId service with provider domain ${conf.domain}`);
         }
+        midAuthorizer = (0, mailerid_authorizer_1.validator)(ownService);
+    }
+    else {
+        midAuthorizer = (0, mailerid_authorizer_1.validator)(undefined);
     }
     if (conf.enabledServices.asmail) {
         app.use('/asmail', (0, asmail_app_1.makeASMailApp)(conf.rootFolder, conf.domain, midAuthorizer, (errLogger === 'console') ? (0, error_handler_1.makeErrLoggerToConsole)('ASMail') : errLogger));
@@ -49,7 +55,7 @@ function servicesApp(conf, errLogger, logSetup) {
             console.log(`Enabled 3NStorage service with provider domain ${conf.domain}`);
         }
     }
-    if (conf.enabledServices.locker) {
+    if ((_a = conf.auxiliaryServices) === null || _a === void 0 ? void 0 : _a.locker) {
         app.use('/locker', (0, locker_app_1.makeLockerApp)(conf.rootFolder, (errLogger === 'console') ? (0, error_handler_1.makeErrLoggerToConsole)('Locker') : errLogger));
         if (logSetup === 'console') {
             console.log(`Enabled Locker service`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "spec-3nweb-server",
-  "version": "1.7.13",
+  "version": "1.8.0",
   "description": "3NWeb spec server.",
   "main": "build/lib.js",
   "types": "build/lib.d.ts",