@ianlucas/cs2-lib-inspect 1.0.4 → 2.0.0-rc.1

package/README.md

@@ -1,6 +1,6 @@
 # cs2-lib-inspect
 
-> A utility for creating inspect links for CS2 items
+> An extension for cs2-lib to create Counter-Strike 2 inspect links
 
 ## Install
 
@@ -11,8 +11,8 @@ npm install @ianlucas/cs2-lib-inspect
 ## Usage
 
 ```typescript
-import { CS_Economy } from "@ianlucas/cs2-lib";
-import { CS_generateInspectLink } from "@ianlucas/cs2-lib-inspect";
+import { CS2Economy } from "@ianlucas/cs2-lib";
+import { generateInspectLink } from "@ianlucas/cs2-lib-inspect";
 
-const link = CS_generateInspectLink(CS_Economy.getById(307));
+const link = generateInspectLink(CS2Economy.getById(307));
 ```

package/dist/index.d.ts

@@ -1,3 +1,3 @@
-import { CS_BaseInventoryItem, CS_InventoryItem, CS_Item } from "@ianlucas/cs2-lib";
-export declare const CS_PREVIEW_URL = "steam://rungame/730/76561202255233023/+csgo_econ_action_preview%20";
-export declare function CS_generateInspectLink(item: CS_Item | CS_BaseInventoryItem | CS_InventoryItem): string;
+import { CS2EconomyItem, CS2InventoryItem } from "@ianlucas/cs2-lib";
+export declare const CS2_PREVIEW_URL = "steam://rungame/730/76561202255233023/+csgo_econ_action_preview%20";
+export declare function generateInspectLink(item: CS2EconomyItem | CS2InventoryItem): string;

package/dist/index.js

@@ -2,18 +2,18 @@
  *  Copyright (c) candyboyz, Ian Lucas. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-import { CS_Economy, CS_MIN_SEED, CS_MIN_STICKER_WEAR, CS_MIN_WEAR, CS_NONE, CS_RARITY_ANCIENT_COLOR, CS_RARITY_COMMON_COLOR, CS_RARITY_IMMORTAL_COLOR, CS_RARITY_LEGENDARY_COLOR, CS_RARITY_MYTHICAL_COLOR, CS_RARITY_RARE_COLOR, CS_RARITY_UNCOMMON_COLOR } from "@ianlucas/cs2-lib";
+import { CS2InventoryItem, CS2RarityColor, CS2_MIN_SEED, CS2_MIN_STICKER_WEAR, CS2_MIN_WEAR } from "@ianlucas/cs2-lib";
 import { Buffer } from "buffer";
 import CRC32 from "crc-32";
-import { CEconItemPreviewDataBlock } from "./econ";
-const CS_RARITY_INT = {
-    [CS_RARITY_COMMON_COLOR]: 1,
-    [CS_RARITY_UNCOMMON_COLOR]: 2,
-    [CS_RARITY_RARE_COLOR]: 3,
-    [CS_RARITY_MYTHICAL_COLOR]: 4,
-    [CS_RARITY_LEGENDARY_COLOR]: 5,
-    [CS_RARITY_ANCIENT_COLOR]: 6,
-    [CS_RARITY_IMMORTAL_COLOR]: 7
+import { CEconItemPreviewDataBlock } from "./econ-item-preview-data-block.js";
+const CS2_RARITY_INT = {
+    [CS2RarityColor.Common]: 1,
+    [CS2RarityColor.Uncommon]: 2,
+    [CS2RarityColor.Rare]: 3,
+    [CS2RarityColor.Mythical]: 4,
+    [CS2RarityColor.Legendary]: 5,
+    [CS2RarityColor.Ancient]: 6,
+    [CS2RarityColor.Immortal]: 7
 };
 const MISSING_ITEM_DEF = {
     graffiti: 1348,
@@ -21,24 +21,24 @@ const MISSING_ITEM_DEF = {
     sticker: 1209,
     musickit: 1314
 };
-export const CS_PREVIEW_URL = "steam://rungame/730/76561202255233023/+csgo_econ_action_preview%20";
+export const CS2_PREVIEW_URL = "steam://rungame/730/76561202255233023/+csgo_econ_action_preview%20";
 function floatToBytes(floatValue) {
     const floatArray = new Float32Array(1);
     floatArray[0] = floatValue;
     const byteArray = new Uint32Array(floatArray.buffer);
     return byteArray[0];
 }
-function getItemAttributes(item) {
-    const { def, index, rarity, type, tint, wearmin } = item;
+function getEconomyItemPreviewData(item) {
+    const { def, index, rarity, type, tint, wearMin } = item;
     const hasStickerObject = MISSING_ITEM_DEF[type] !== undefined;
     const hasPaintIndex = !hasStickerObject && type !== "musickit";
     return {
         defindex: MISSING_ITEM_DEF[type] ?? def,
         musicindex: type === "musickit" ? index : undefined,
         paintindex: hasPaintIndex ? index : undefined,
-        paintseed: CS_Economy.hasSeed(item) ? CS_MIN_SEED : undefined,
-        paintwear: CS_Economy.hasWear(item) ? wearmin ?? CS_MIN_WEAR : undefined,
-        rarity: CS_RARITY_INT[rarity] ?? 0,
+        paintseed: item.hasSeed() ? CS2_MIN_SEED : undefined,
+        paintwear: item.hasWear() ? wearMin ?? CS2_MIN_WEAR : undefined,
+        rarity: CS2_RARITY_INT[rarity] ?? 0,
         stickers: hasStickerObject
             ? [
                 {
@@ -50,24 +50,22 @@ function getItemAttributes(item) {
             : []
     };
 }
-function getBaseInventoryItemAttributes({ id, nametag, seed, stattrak, stickers, stickerswear, wear }) {
-    const item = CS_Economy.getById(id);
-    const baseAttributes = getItemAttributes(item);
+function getInventoryItemPreviewData(item) {
+    const { nameTag, seed, statTrak, stickers, wear } = item;
+    const baseAttributes = getEconomyItemPreviewData(item);
     return {
         ...baseAttributes,
-        customname: nametag,
-        killeaterscoretype: stattrak !== undefined ? 0 : undefined,
-        killeatervalue: stattrak,
-        paintseed: CS_Economy.hasSeed(item) ? seed ?? CS_MIN_SEED : undefined,
-        paintwear: CS_Economy.hasWear(item) ? floatToBytes(wear ?? item.wearmin ?? CS_MIN_WEAR) : undefined,
+        customname: nameTag,
+        killeaterscoretype: statTrak !== undefined ? 0 : undefined,
+        killeatervalue: statTrak,
+        paintseed: item.hasSeed() ? seed ?? CS2_MIN_SEED : undefined,
+        paintwear: item.hasWear() ? floatToBytes(wear ?? item.wearMin ?? CS2_MIN_WEAR) : undefined,
         stickers: stickers !== undefined
-            ? stickers
-                .map((sticker, slot) => ({
+            ? item.someStickers().map(([slot, { id, wear }]) => ({
                 slot,
-                stickerId: CS_Economy.getById(sticker).index,
-                wear: stickerswear?.[slot] ?? CS_MIN_STICKER_WEAR
+                stickerId: item.economy.getById(id).index,
+                wear: wear ?? CS2_MIN_STICKER_WEAR
             }))
-                .filter(({ stickerId }) => stickerId !== CS_NONE)
             : baseAttributes.stickers
     };
 }
@@ -80,11 +78,6 @@ function generateHex(attributes) {
     const buffer = Buffer.concat([payload, crcBuffer]);
     return buffer.toString("hex").toUpperCase();
 }
-export function CS_generateInspectLink(item) {
-    const econ = {
-        ...(typeof item.uid === undefined
-            ? getItemAttributes(item)
-            : getBaseInventoryItemAttributes(item))
-    };
-    return `${CS_PREVIEW_URL}${generateHex(econ)}`;
+export function generateInspectLink(item) {
+    return `${CS2_PREVIEW_URL}${generateHex(item instanceof CS2InventoryItem ? getInventoryItemPreviewData(item) : getEconomyItemPreviewData(item))}`;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ianlucas/cs2-lib-inspect",
-    "version": "1.0.4",
+    "version": "2.0.0-rc.1",
     "description": "A utility for creating inspect links for CS2 items",
     "license": "MIT",
     "repository": "ianlucas/cs2-lib-inspect",
@@ -18,7 +18,7 @@
         "crc-32": "^1.2.2"
     },
     "peerDependencies": {
-        "@ianlucas/cs2-lib": "^4.5.0"
+        "@ianlucas/cs2-lib": "^5.0.0-rc.7"
     },
     "devDependencies": {
         "@protobuf-ts/plugin": "^2.9.3",