Move random string to Random class in extensions

src/api/routes/auth/generate-registration-tokens.ts

@@ -17,8 +17,9 @@
 */
 
 import { Request, Response, Router } from "express";
-import { randomString, route } from "@spacebar/api";
+import { route } from "@spacebar/api";
 import { ValidRegistrationToken } from "@spacebar/database";
+import { Random } from "@spacebar/extensions";
 import { Config } from "@spacebar/util";
 
 const router: Router = Router({ mergeParams: true });
@@ -48,7 +49,7 @@ router.get(
 
         for (let i = 0; i < count; i++) {
             const token = ValidRegistrationToken.create({
-                token: randomString(length),
+                token: Random.getString("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789", length),
                 expires_at: new Date(Date.now() + Config.get().security.defaultRegistrationTokenExpiration),
             });
             tokens.push(token);

src/api/routes/channels/#channel_id/attachments.ts

@@ -17,8 +17,9 @@
 */
 
 import { Request, Response, Router } from "express";
-import { randomString, route } from "@spacebar/api";
+import { route } from "@spacebar/api";
 import { Channel, CloudAttachment } from "@spacebar/database";
+import { Random } from "@spacebar/extensions";
 import { Config, Permissions } from "@spacebar/util";
 import { UploadAttachmentRequestSchema, UploadAttachmentResponseSchema } from "@spacebar/schemas";
 
@@ -53,7 +54,7 @@ router.post(
         }
 
         const cdnUrl = Config.get().cdn.endpointPublic;
-        const batchId = `CLOUD_${user.id}_${randomString(128)}`;
+        const batchId = `CLOUD_${user.id}_${Random.getString("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789", 128)}`;
 
         // validate IDs
         const seenIds: (string | undefined)[] = [];

src/api/routes/channels/#channel_id/invites.ts

@@ -18,10 +18,11 @@
 
 import { Request, Response, Router } from "express";
 import { HTTPError } from "lambert-server/HTTPError";
-import { randomString, route } from "@spacebar/api";
+import { route } from "@spacebar/api";
 import { Channel, Guild, Invite, PublicInviteRelation, User } from "@spacebar/database";
 import { InviteCreateEvent, emitEvent } from "@spacebar/util";
 import { InviteCreateSchema, isTextChannel } from "@spacebar/schemas";
+import { Random } from "@spacebar/extensions";
 
 const router: Router = Router({ mergeParams: true });
 
@@ -59,7 +60,7 @@ router.post(
         const expires_at = body.max_age == 0 || body.max_age == undefined ? undefined : new Date(body.max_age * 1000 + Date.now());
 
         const invite = await Invite.create({
-            code: randomString(),
+            code: Random.getString("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789", 6),
             temporary: body.temporary || true,
             uses: 0,
             max_uses: body.max_uses ? Math.max(0, body.max_uses) : 0,

src/api/routes/guilds/#guild_id/widget.json.ts

@@ -17,8 +17,9 @@
 */
 
 import { Request, Response, Router } from "express";
-import { randomString, route } from "@spacebar/api";
+import { route } from "@spacebar/api";
 import { Channel, Guild, Member, Invite } from "@spacebar/database";
+import { Random } from "@spacebar/extensions";
 import { Config, DiscordApiErrors, Permissions } from "@spacebar/util";
 import { ChannelType, GuildWidgetJsonResponse } from "@spacebar/schemas";
 
@@ -93,7 +94,7 @@ async function getWidgetJsonData(guild_id: string) {
         const expires_at = new Date(max_age * 1000 + Date.now());
 
         invite = await Invite.create({
-            code: randomString(),
+            code: Random.getString("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789", 6),
             temporary: false,
             uses: 0,
             max_uses: 0,

src/api/util/handlers/Message.ts

@@ -18,9 +18,9 @@
 
 import { HTTPError } from "lambert-server/HTTPError";
 import { Equal, In, Or } from "typeorm";
-import { fillMessageUrlEmbeds, randomString } from "@spacebar/api";
+import { fillMessageUrlEmbeds } from "@spacebar/api";
 import { getDatabase, Application, Attachment, Channel, CloudAttachment, Guild, Member, Message, ReadState, Role, Session, Sticker, User, Webhook } from "@spacebar/database";
-import { mathLogBase, arrayDistributeSequentially, Stopwatch } from "@spacebar/extensions";
+import { mathLogBase, arrayDistributeSequentially, Stopwatch, Random } from "@spacebar/extensions";
 import {
     Config,
     DiscordApiErrors,
@@ -280,7 +280,7 @@ export function handleComps(components: BaseMessageComponents[], flags: number)
         throw FieldErrors(errors);
     }
     return async (messageId: string, user: User, channel: Channel) => {
-        const batchId = `CLOUD_compUploads_${randomString(128)}`;
+        const batchId = `CLOUD_compUploads_${Random.getString("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789", 128)}`;
         (await Promise.all(medias.map((m, index) => processMedia(m, messageId, batchId, user, channel, index + "")))).forEach((_) => _?.());
     };
 }

src/api/util/index.ts

@@ -20,7 +20,6 @@ export * from "./utility/Base64";
 export * from "./utility/ipAddress";
 export * from "./handlers/Message";
 export * from "./utility/passwordStrength";
-export * from "./utility/RandomInviteID";
 export * from "./handlers/route";
 export * from "./handlers/Voice";
 export * from "./utility/captcha";

src/api/util/utility/RandomInviteID.ts

@@ -1,68 +0,0 @@
-/*
-	Spacebar: A FOSS re-implementation and extension of the Discord.com backend.
-	Copyright (C) 2023 Spacebar and Spacebar Contributors
-	
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Affero 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 Affero General Public License for more details.
-	
-	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/>.
-*/
-
-import { Snowflake } from "@spacebar/util";
-import crypto from "node:crypto";
-
-// TODO: 'random'? seriously? who named this?
-// And why is this even here? Just use cryto.randomBytes?
-
-export function randomString(length = 6) {
-    // Declare all characters
-    const chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
-
-    // Pick characers randomly
-    let str = "";
-    for (let i = 0; i < length; i++) {
-        str += chars.charAt(Math.floor(crypto.randomInt(chars.length)));
-    }
-
-    return str;
-}
-
-export function snowflakeBasedInvite() {
-    // Declare all characters
-    const chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
-    const base = BigInt(chars.length);
-    let snowflake = Snowflake.generateWorkerProcess();
-
-    // snowflakes hold ~10.75 characters worth of entropy;
-    // safe to generate a 8-char invite out of them
-    const str = "";
-    for (let i = 0; i < 10; i++) {
-        str.concat(chars.charAt(Number(snowflake % base)));
-        snowflake = snowflake / base;
-    }
-
-    return str
-        .slice(3, 3 + 8)
-        .split("")
-        .reverse()
-        .join("");
-}
-
-export function randomUpperString(length: number = 10) {
-    const chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
-
-    let result = "";
-    for (let i = 0; i < length; i++) {
-        result += chars.charAt(Math.floor(Math.random() * chars.length));
-    }
-
-    return result;
-}