move strutil and time.js to putility

src/backend/src/Kernel.js

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-const { AdvancedBase } = require("@heyputer/putility");
+const { AdvancedBase, libs } = require("@heyputer/putility");
 const { Context } = require('./util/context');
 const BaseService = require("./services/BaseService");
 const useapi = require('useapi');
@@ -25,7 +25,8 @@ const { hideBin } = require('yargs/helpers');
 const { Extension } = require("./Extension");
 const { ExtensionModule } = require("./ExtensionModule");
 const { spawn } = require("node:child_process");
-const { quot } = require("./util/strutil");
+
+const { quot } = libs.string;
 
 class Kernel extends AdvancedBase {
     constructor ({ entry_path } = {}) {

src/backend/src/api/APIError.js

@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 const { URLSearchParams } = require("node:url");
-const { quot } = require("../util/strutil");
+const { quot } = require('@heyputer/putility').libs.string;
 
 /**
  * APIError represents an error that can be sent to the client.

src/backend/src/boot/RuntimeEnvironment.js

@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 const { AdvancedBase } = require("@heyputer/putility");
-const { quot } = require("../util/strutil");
+const { quot } = require('@heyputer/putility').libs.string;
 const { TechnicalError } = require("../errors/TechnicalError");
 const { print_error_help } = require("../errors/error_help_details");
 const default_config = require("./default_config");

src/backend/src/config/ConfigLoader.js

@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 const { AdvancedBase } = require("@heyputer/putility");
-const { quot } = require("../util/strutil");
+const { quot } = require('@heyputer/putility').libs.string;
 
 class ConfigLoader extends AdvancedBase {
     static MODULES = {

src/backend/src/errors/error_help_details.js

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-const { quot, osclink } = require("../util/strutil");
+const { quot, osclink } = require('@heyputer/putility').libs.string;
 
 const reused = {
     runtime_env_references: [

src/backend/src/modules/core/lib/__lib__.js

@@ -1,6 +1,5 @@
 module.exports = {
     util: {
-        strutil: require('./string.js'),
         logutil: require('./log.js'),
         identutil: require('./identifier.js'),
         stdioutil: require('./stdio.js'),

src/backend/src/modules/selfhosted/DefaultUserService.js

@@ -27,7 +27,7 @@ const { buffer_to_stream } = require("../../util/streamutil");
 const BaseService = require("../../services/BaseService");
 const { Actor, UserActorType } = require("../../services/auth/Actor");
 const { DB_WRITE } = require("../../services/database/consts");
-const { quot } = require("../../util/strutil");
+const { quot } = require('@heyputer/putility').libs.string;
 
 const USERNAME = 'admin';
 

src/backend/src/modules/web/WebServerService.js

@@ -30,6 +30,7 @@ const auth = require('../../middleware/auth.js');
 const { surrounding_box, es_import_promise } = require('../../fun/dev-console-ui-utils.js');
 
 const relative_require = require;
+const strutil = require('@heyputer/putility').libs.string;
 
 /**
 * This class, WebServerService, is responsible for starting and managing the Puter web server.
@@ -37,10 +38,6 @@ const relative_require = require;
 * It also validates the host header and IP addresses to prevent security vulnerabilities.
 */
 class WebServerService extends BaseService {
-    static USE = {
-        strutil: 'core.util.strutil',
-    }
-
     static MODULES = {
         https: require('https'),
         http: require('http'),
@@ -201,7 +198,7 @@ class WebServerService extends BaseService {
         */
         this.startup_widget = () => {
 
-            const link = `\x1B[34;1m${this.strutil.osclink(url)}\x1B[0m`;
+            const link = `\x1B[34;1m${strutil.osclink(url)}\x1B[0m`;
             const lines = [
                 `Puter is now live at: ${link}`,
                 `Type web:dismiss to un-stick this message`,

src/backend/src/services/AppInformationService.js

@@ -18,7 +18,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 const { asyncSafeSetInterval } = require("../util/promise");
-const { MINUTE, SECOND } = require("../util/time");
+const { MINUTE, SECOND } = require("@heyputer/putility").libs.time;
 const { origin_from_url } = require("../util/urlutil");
 const { DB_READ } = require("./database/consts");
 

src/backend/src/services/SessionService.js

@@ -19,7 +19,7 @@
  */
 const { invalidate_cached_user, get_user } = require("../helpers");
 const { asyncSafeSetInterval } = require("../util/promise");
-const { MINUTE, SECOND } = require("../util/time");
+const { MINUTE, SECOND } = require("@heyputer/putility").libs.time;
 const BaseService = require("./BaseService");
 const { DB_WRITE } = require("./database/consts");
 

src/backend/src/services/StrategizedService.js

@@ -18,7 +18,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 const { TechnicalError } = require("../errors/TechnicalError");
-const { quot } = require("../util/strutil");
+const { quot } = require('@heyputer/putility').libs.string;
 
 
 /**

src/backend/src/services/TrackSpendingService.js

@@ -19,8 +19,8 @@
  */
 const { TimeWindow } = require("../util/opmath");
 const SmolUtil = require("../util/smolutil");
-const { format_as_usd } = require("../util/strutil");
-const { MINUTE, SECOND } = require("../util/time");
+const { format_as_usd } = require('@heyputer/putility').libs.string;
+const { MINUTE, SECOND } = require("@heyputer/putility").libs.time;
 const BaseService = require("./BaseService");
 
 

src/backend/src/services/abuse-prevention/EdgeRateLimitService.js

@@ -19,9 +19,9 @@
  */
 const { Context } = require("../../util/context");
 const { asyncSafeSetInterval } = require("../../util/promise");
-const { quot } = require("../../util/strutil");
+const { quot } = require('@heyputer/putility').libs.string;
 
-const { MINUTE, HOUR } = require('../../util/time.js');
+const { MINUTE, HOUR } = require('@heyputer/putility').libs.time;
 const BaseService = require("../BaseService");
 
 /* INCREMENTAL CHANGES

src/backend/src/services/runtime-analysis/ServerHealthService.js

@@ -18,7 +18,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 const BaseService = require("../BaseService");
-const { SECOND } = require("../../util/time");
+const { SECOND } = require("@heyputer/putility").libs.time;
 const { parse_meminfo } = require("../../util/linux");
 const { asyncSafeSetInterval, TeePromise } = require("../../util/promise");
 

src/backend/src/structured/sequence/share.js

@@ -27,7 +27,7 @@ const { PermissionUtil } = require("../../services/auth/PermissionService");
 const FSNodeParam = require("../../api/filesystem/FSNodeParam");
 const { TYPE_DIRECTORY } = require("../../filesystem/FSNodeContext");
 const { UsernameNotifSelector } = require("../../services/NotificationService");
-const { quot } = require("../../util/strutil");
+const { quot } = require('@heyputer/putility').libs.string;
 const { whatis } = require("../../util/langutil");
 
 /*

src/backend/src/util/hl_types.js

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-const { quot } = require("./strutil");
+const { quot } = require('@heyputer/putility').libs.string;
 
 const hl_type_definitions = {
     flag: {

src/backend/src/util/strutil.js

@@ -1,2 +0,0 @@
-// This file is a legacy alias
-module.exports = require('../modules/core/lib/string.js');

src/putility/index.js

@@ -31,6 +31,8 @@ module.exports = {
         context: require('./src/libs/context'),
         listener: require('./src/libs/listener'),
         log: require('./src/libs/log'),
+        string: require('./src/libs/string'),
+        time: require('./src/libs/time'),
     },
     concepts: {
         Service,

src/putility/src/libs/string.js

@@ -73,3 +73,4 @@ module.exports = {
     osclink,
     format_as_usd,
 };
+

src/putility/src/libs/time.js

@@ -49,3 +49,4 @@ module.exports = {
     HOUR,
     DAY,
 };
+